Skip to content

Commit

Permalink
chore: update config backend url domain name (#2699)
Browse files Browse the repository at this point in the history
  • Loading branch information
chandumlg authored Nov 14, 2022
1 parent c7af5d9 commit 9e06351
Show file tree
Hide file tree
Showing 17 changed files with 23 additions and 24 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
🔥 <b>New: Just launched <a href="https://github.com/rudderlabs/rudder-server/discussions/2401">RudderStack v1.0</a></b>
<br/>
</p>

<p align="center">
<a href="https://www.rudderstack.com/">
<img src="resources/logo.png">
Expand Down Expand Up @@ -63,8 +63,8 @@ With RudderStack, you can build customer data pipelines that connect your whole
</a>
</p>

| Try **RudderStack Cloud Free** - a free tier of [**RudderStack Cloud**](https://www.rudderstack.com/cloud/). Click [**here**](https://app.rudderlabs.com/signup?type=freetrial) to start building a smarter customer data pipeline today, with RudderStack Cloud. |
|:------|
| Try **RudderStack Cloud Free** - a free tier of [**RudderStack Cloud**](https://www.rudderstack.com/cloud/). Click [**here**](https://app.rudderstack.com/signup?type=freetrial) to start building a smarter customer data pipeline today, with RudderStack Cloud. |
| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

## Key features

Expand All @@ -74,7 +74,7 @@ With RudderStack, you can build customer data pipelines that connect your whole

- **High Availability**: RudderStack comes with at least 99.99% uptime. We have built a sophisticated error handling and retry system that ensures that your data will be delivered even in the event of network partitions or destinations downtime.

- **Privacy and Security**: You can collect and store your customer data without sending everything to a third-party vendor. With RudderStack, you get fine-grained control over what data to forward to which analytical tool.
- **Privacy and Security**: You can collect and store your customer data without sending everything to a third-party vendor. With RudderStack, you get fine-grained control over what data to forward to which analytical tool.

- **Unlimited Events**: Event volume-based pricing of most of the commercial systems is broken. With RudderStack, you are be able to collect as much data as possible without worrying about overrunning your event budgets.

Expand All @@ -88,7 +88,7 @@ With RudderStack, you can build customer data pipelines that connect your whole

## Get started

The easiest way to experience RudderStack is to [**sign up**](https://app.rudderlabs.com/signup?type=freetrial) for **RudderStack Cloud Free** - a completely free tier of [**RudderStack Cloud**](https://www.rudderstack.com/cloud/).
The easiest way to experience RudderStack is to [**sign up**](https://app.rudderstack.com/signup?type=freetrial) for **RudderStack Cloud Free** - a completely free tier of [**RudderStack Cloud**](https://www.rudderstack.com/cloud/).

You can also set up RudderStack on your platform of choice with these two easy steps:

Expand Down
2 changes: 1 addition & 1 deletion build/docker.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ JOBS_DB_DB_NAME=jobsdb
JOBS_DB_PASSWORD=password
JOBS_DB_SSL_MODE=disable

CONFIG_BACKEND_URL=https://api.rudderlabs.com
CONFIG_BACKEND_URL=https://api.rudderstack.com
CONFIG_BACKEND_TOKEN=<this is deprecating soon use WORKSPACE_TOKEN instead>
WORKSPACE_TOKEN=<your_token_here>
CONFIG_PATH=/app/config/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/backend-config/backend-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type backendConfigImpl struct {
}

func loadConfig() {
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
cpRouterURL = config.GetString("CP_ROUTER_URL", "https://cp-router.rudderlabs.com")
config.RegisterDurationConfigVariable(5, &pollInterval, true, time.Second, []string{"BackendConfig.pollInterval", "BackendConfig.pollIntervalInS"}...)
config.RegisterDurationConfigVariable(300, &regulationsPollInterval, true, time.Second, []string{"BackendConfig.regulationsPollInterval", "BackendConfig.regulationsPollIntervalInS"}...)
Expand Down
2 changes: 1 addition & 1 deletion config/backend-config/namespace_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (nc *namespaceConfig) SetUp() (err error) {
nc.HostedServiceSecret = config.GetString("HOSTED_SERVICE_SECRET", "")
}
if nc.ConfigBackendURL == nil {
configBackendURL := config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL := config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
nc.ConfigBackendURL, err = url.Parse(configBackendURL)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion config/backend-config/namespace_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func Test_Namespace_SetUp(t *testing.T) {
client = &namespaceConfig{
Logger: logger.NOP,
}
configBackendURL = "https://api.test.rudderlabs.com"
configBackendURL = "https://api.test.rudderstack.com"
)
parsedConfigBackendURL, err := url.Parse(configBackendURL)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion config/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ JOBS_DB_SSL_MODE=disable
DEST_TRANSFORM_URL=http://localhost:9090
TEST_SINK_URL=http://localhost:8181

CONFIG_BACKEND_URL=https://api.rudderlabs.com
CONFIG_BACKEND_URL=https://api.rudderstack.com
CONFIG_BACKEND_TOKEN=<this is deprecating soon use WORKSPACE_TOKEN instead>
WORKSPACE_TOKEN=<your_token_here>

Expand Down
2 changes: 1 addition & 1 deletion enterprise/suppress-user/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var (
func loadConfig() {
config.RegisterDurationConfigVariable(300, &regulationsPollInterval, true, time.Second, "BackendConfig.Regulations.pollInterval")
config.RegisterIntConfigVariable(50, &suppressionApiPageSize, false, 1, "BackendConfig.Regulations.pageSize")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
}

// Setup initializes Suppress User feature
Expand Down
2 changes: 1 addition & 1 deletion processor/integrations/integrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func GetTransformerURL() string {

// GetDestinationURL returns node URL
func GetDestinationURL(destType string) string {
destinationEndPoint := fmt.Sprintf("%s/v0/%s", destTransformURL, strings.ToLower(destType))
destinationEndPoint := fmt.Sprintf("%s/v0/destinations/%s", destTransformURL, strings.ToLower(destType))
if misc.Contains(warehouseutils.WarehouseDestinations, destType) {
whSchemaVersionQueryParam := fmt.Sprintf("whSchemaVersion=%s&whIDResolve=%v", config.GetString("Warehouse.schemaVersion", "v1"), warehouseutils.IDResolutionEnabled())
if destType == "RS" {
Expand Down
2 changes: 1 addition & 1 deletion processor/processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,7 @@ func assertDestinationTransform(messages map[string]mockEventData, sourceId, des
fmt.Println("url", url)
fmt.Println("destinationDefinitionName", destinationDefinitionName)

Expect(url).To(Equal(fmt.Sprintf("http://localhost:9090/v0/%s", destinationDefinitionName)))
Expect(url).To(Equal(fmt.Sprintf("http://localhost:9090/v0/destinations/%s", destinationDefinitionName)))

fmt.Println("clientEvents:", len(clientEvents))
fmt.Println("expect:", expectations.events)
Expand Down
5 changes: 2 additions & 3 deletions rudder-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
- JOBS_DB_DB_NAME=jobsdb
- JOBS_DB_PASSWORD=password
- DEST_TRANSFORM_URL=http://d-transformer:9090
- CONFIG_BACKEND_URL=https://api.rudderlabs.com
- CONFIG_BACKEND_URL=https://api.rudderstack.com
- WORKSPACE_TOKEN=<your_workspace_token> # Must be written without quotes e.g. WORKSPACE_TOKEN=20TokEO34NWitou2t3quO8teS7
- STATSD_SERVER_URL=metrics-exporter:9125
# - RSERVER_BACKEND_CONFIG_CONFIG_FROM_FILE=true
Expand All @@ -48,7 +48,6 @@ services:
# - "9000:9000"
# command: server /data
metrics-exporter:
image:
prom/statsd-exporter:v0.22.4
image: prom/statsd-exporter:v0.22.4
ports:
- "9102:9102"
2 changes: 1 addition & 1 deletion runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func (r *Runner) Run(ctx context.Context, args []string) int {
backendconfig.DefaultBackendConfig.WaitForConfig(ctx)

c := features.NewClient(
config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com"),
config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com"),
backendconfig.DefaultBackendConfig.Identity(),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func Init() {
}

func loadConfig() {
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
config.RegisterBoolConfigVariable(false, &disableEventDeliveryStatusUploads, true, "DestinationDebugger.disableEventDeliveryStatusUploads")
}

Expand Down
2 changes: 1 addition & 1 deletion services/debugger/source/eventUploader.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func Init() {
}

func loadConfig() {
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
config.RegisterBoolConfigVariable(false, &disableEventUploads, true, "SourceDebugger.disableEventUploads")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func Init() {
}

func loadConfig() {
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
config.RegisterBoolConfigVariable(false, &disableTransformationUploads, true, "TransformationDebugger.disableTransformationStatusUploads")
}

Expand Down
2 changes: 1 addition & 1 deletion testhelper/.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WAREHOUSE_JOBS_DB_USER=rudder
WAREHOUSE_JOBS_DB_PASSWORD=password
RUDDER_ADMIN_PASSWORD=password
RSERVER_BACKEND_CONFIG_CONFIG_FROM_FILE=true
CONFIG_BACKEND_URL="https://api.rudderlabs.com"
CONFIG_BACKEND_URL="https://api.rudderstack.com"
CONFIG_PATH="./config/config.yaml"
TEST_SINK_URL="http://localhost:8181"
GO_ENV=production
Expand Down
2 changes: 1 addition & 1 deletion testhelper/destination/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func SetupTransformer(pool *dockertest.Pool, d cleaner) (*TransformerResource, e
Tag: "latest",
ExposedPorts: []string{"9090"},
Env: []string{
"CONFIG_BACKEND_URL=https://api.rudderlabs.com",
"CONFIG_BACKEND_URL=https://api.rudderstack.com",
},
})
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions warehouse/warehouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func loadConfig() {
config.RegisterDurationConfigVariable(30, &tableCountQueryTimeout, true, time.Second, []string{"Warehouse.tableCountQueryTimeout", "Warehouse.tableCountQueryTimeoutInS"}...)

appName = misc.DefaultString("rudder-server").OnError(os.Hostname())
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com")
configBackendURL = config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com")
}

// get name of the worker (`destID_namespace`) to be stored in map wh.workerChannelMap
Expand Down Expand Up @@ -2219,7 +2219,7 @@ func Start(ctx context.Context, app app.App) error {
backendconfig.DefaultBackendConfig.WaitForConfig(ctx)

c := features.NewClient(
config.GetString("CONFIG_BACKEND_URL", "https://api.rudderlabs.com"),
config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com"),
backendconfig.DefaultBackendConfig.Identity(),
)

Expand Down

0 comments on commit 9e06351

Please sign in to comment.