Additional renamings

configcat · May 19, 2023 · 70c9bc0 · 70c9bc0
1 parent 814d0d0
commit 70c9bc0
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 70 deletions.
diff --git a/config/env_test.go b/config/env_test.go
@@ -11,7 +11,6 @@ import (
 func TestSDKConfig_ENV(t *testing.T) {
 	t.Setenv("CONFIGCAT_SDKS", `{"sdk1": "sdkKey"}`)
 	t.Setenv("CONFIGCAT_SDK1_BASE_URL", "base")
-	t.Setenv("CONFIGCAT_SDK1_KEY", "sdkKey")
 	t.Setenv("CONFIGCAT_SDK1_POLL_INTERVAL", "300")
 	t.Setenv("CONFIGCAT_SDK1_DATA_GOVERNANCE", "eu")
 	t.Setenv("CONFIGCAT_SDK1_LOG_LEVEL", "error")

diff --git a/config/validate.go b/config/validate.go
@@ -8,7 +8,7 @@ import (
 
 func (c *Config) Validate() error {
 	if len(c.SDKs) == 0 {
-		return fmt.Errorf("sdk: at least 1 environment with an SDK key required")
+		return fmt.Errorf("sdk: at least 1 SDK must be configured")
 	}
 	for id, env := range c.SDKs {
 		if err := env.validate(&c.Cache, id); err != nil {

diff --git a/config/validate_test.go b/config/validate_test.go
@@ -9,7 +9,7 @@ import (
 func TestConfig_Validate(t *testing.T) {
 	t.Run("no envs", func(t *testing.T) {
 		conf := Config{}
-		require.ErrorContains(t, conf.Validate(), "sdk: at least 1 environment with an SDK key required")
+		require.ErrorContains(t, conf.Validate(), "sdk: at least 1 SDK must be configured")
 	})
 	t.Run("missing sdk key", func(t *testing.T) {
 		conf := Config{SDKs: map[string]*SDKConfig{"env1": {}}}

diff --git a/status/mware_test.go b/status/mware_test.go
@@ -24,11 +24,11 @@ func TestInterceptSdk(t *testing.T) {
 		stat := readStatus(repSrv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["test"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["test"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["test"].Source.Records))
-		assert.Contains(t, stat.Environments["test"].Source.Records[0], "config fetched")
-		assert.Equal(t, RemoteSrc, stat.Environments["test"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["test"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["test"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["test"].Source.Records))
+		assert.Contains(t, stat.SDKs["test"].Source.Records[0], "config fetched")
+		assert.Equal(t, RemoteSrc, stat.SDKs["test"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -47,11 +47,11 @@ func TestInterceptSdk(t *testing.T) {
 		stat := readStatus(repSrv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["test"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["test"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["test"].Source.Records))
-		assert.Contains(t, stat.Environments["test"].Source.Records[0], "config not modified")
-		assert.Equal(t, RemoteSrc, stat.Environments["test"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["test"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["test"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["test"].Source.Records))
+		assert.Contains(t, stat.SDKs["test"].Source.Records[0], "config not modified")
+		assert.Equal(t, RemoteSrc, stat.SDKs["test"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -70,11 +70,11 @@ func TestInterceptSdk(t *testing.T) {
 		stat := readStatus(repSrv.URL)
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["test"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["test"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["test"].Source.Records))
-		assert.Contains(t, stat.Environments["test"].Source.Records[0], "unexpected response received: 400 Bad Request")
-		assert.Equal(t, RemoteSrc, stat.Environments["test"].Source.Type)
+		assert.Equal(t, Degraded, stat.SDKs["test"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["test"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["test"].Source.Records))
+		assert.Contains(t, stat.SDKs["test"].Source.Records[0], "unexpected response received: 400 Bad Request")
+		assert.Equal(t, RemoteSrc, stat.SDKs["test"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})

diff --git a/status/status.go b/status/status.go
@@ -41,9 +41,9 @@ type Reporter interface {
 }
 
 type Status struct {
-	Status       HealthStatus          `json:"status"`
-	Environments map[string]*SdkStatus `json:"environments"`
-	Cache        CacheStatus           `json:"cache"`
+	Status HealthStatus          `json:"status"`
+	SDKs   map[string]*SdkStatus `json:"sdks"`
+	Cache  CacheStatus           `json:"cache"`
 }
 
 type SdkStatus struct {
@@ -91,7 +91,7 @@ func NewReporter(conf *config.Config) Reporter {
 			},
 		},
 	}
-	envs := make(map[string]*SdkStatus, len(conf.SDKs))
+	sdks := make(map[string]*SdkStatus, len(conf.SDKs))
 	for key, env := range conf.SDKs {
 		status := &SdkStatus{
 			Mode:   Online,
@@ -117,9 +117,9 @@ func NewReporter(conf *config.Config) Reporter {
 				r.ReportError(key, fmt.Errorf("cache offline source enabled without a configured cache"))
 			}
 		}
-		envs[key] = status
+		sdks[key] = status
 	}
-	r.status.Environments = envs
+	r.status.SDKs = sdks
 	return r
 }
 
@@ -150,10 +150,10 @@ func (r *reporter) getStatus() Status {
 	overallStatus := Healthy
 	for key := range r.conf.SDKs {
 		if sdk, ok := r.records[key]; ok {
-			stat := current.Environments[key].Source.Status
+			stat := current.SDKs[key].Source.Status
 			rec, stat := r.checkStatus(sdk)
-			current.Environments[key].Source.Records = rec
-			current.Environments[key].Source.Status = stat
+			current.SDKs[key].Source.Records = rec
+			current.SDKs[key].Source.Status = stat
 			if stat == Degraded {
 				overallStatus = Degraded
 			}

diff --git a/status/status_test.go b/status/status_test.go
@@ -19,10 +19,10 @@ func TestReporter_Online(t *testing.T) {
 		stat := readStatus(srv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["t"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, RemoteSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["t"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, RemoteSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -35,21 +35,21 @@ func TestReporter_Online(t *testing.T) {
 		stat := readStatus(srv.URL)
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["t"].Mode)
-		assert.Equal(t, 2, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, RemoteSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Degraded, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["t"].Mode)
+		assert.Equal(t, 2, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, RemoteSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 
 		reporter.ReportOk("t", "")
 		stat = readStatus(srv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Online, stat.Environments["t"].Mode)
-		assert.Equal(t, 3, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, RemoteSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Online, stat.SDKs["t"].Mode)
+		assert.Equal(t, 3, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, RemoteSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -64,12 +64,12 @@ func TestReporter_Online(t *testing.T) {
 		reporter.ReportOk("t", "m6")
 		stat := readStatus(srv.URL)
 
-		assert.Equal(t, 5, len(stat.Environments["t"].Source.Records))
-		assert.Contains(t, stat.Environments["t"].Source.Records[0], "m2")
-		assert.Contains(t, stat.Environments["t"].Source.Records[1], "m3")
-		assert.Contains(t, stat.Environments["t"].Source.Records[2], "m4")
-		assert.Contains(t, stat.Environments["t"].Source.Records[3], "m5")
-		assert.Contains(t, stat.Environments["t"].Source.Records[4], "m6")
+		assert.Equal(t, 5, len(stat.SDKs["t"].Source.Records))
+		assert.Contains(t, stat.SDKs["t"].Source.Records[0], "m2")
+		assert.Contains(t, stat.SDKs["t"].Source.Records[1], "m3")
+		assert.Contains(t, stat.SDKs["t"].Source.Records[2], "m4")
+		assert.Contains(t, stat.SDKs["t"].Source.Records[3], "m5")
+		assert.Contains(t, stat.SDKs["t"].Source.Records[4], "m6")
 	})
 }
 
@@ -81,10 +81,10 @@ func TestReporter_Offline(t *testing.T) {
 		stat := readStatus(srv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Offline, stat.Environments["t"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, FileSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Offline, stat.SDKs["t"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, FileSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -94,10 +94,10 @@ func TestReporter_Offline(t *testing.T) {
 		stat := readStatus(srv.URL)
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Offline, stat.Environments["t"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, CacheSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Degraded, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Offline, stat.SDKs["t"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, CacheSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, NA, stat.Cache.Status)
 		assert.Equal(t, 0, len(stat.Cache.Records))
 	})
@@ -109,10 +109,10 @@ func TestReporter_Offline(t *testing.T) {
 		stat := readStatus(srv.URL)
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
-		assert.Equal(t, Offline, stat.Environments["t"].Mode)
-		assert.Equal(t, 1, len(stat.Environments["t"].Source.Records))
-		assert.Equal(t, CacheSrc, stat.Environments["t"].Source.Type)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
+		assert.Equal(t, Offline, stat.SDKs["t"].Mode)
+		assert.Equal(t, 1, len(stat.SDKs["t"].Source.Records))
+		assert.Equal(t, CacheSrc, stat.SDKs["t"].Source.Type)
 		assert.Equal(t, Healthy, stat.Cache.Status)
 		assert.Equal(t, 1, len(stat.Cache.Records))
 	})
@@ -134,7 +134,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Degraded, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("2 records, 1 error then 1 ok", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t": {}}}).(*reporter)
@@ -143,7 +143,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("2 records, 1 ok then 1 error", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t": {}}}).(*reporter)
@@ -152,7 +152,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("3 records, 1 ok then 2 errors", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t": {}}}).(*reporter)
@@ -162,7 +162,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Degraded, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("3 records, 1 ok then 1 error then 1 ok", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t": {}}}).(*reporter)
@@ -172,7 +172,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("3 records, 1 error then 1 ok then 1 error", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t": {}}}).(*reporter)
@@ -182,7 +182,7 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Healthy, stat.Status)
-		assert.Equal(t, Healthy, stat.Environments["t"].Source.Status)
+		assert.Equal(t, Healthy, stat.SDKs["t"].Source.Status)
 	})
 	t.Run("2 envs 1 degraded", func(t *testing.T) {
 		reporter := NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"t1": {}, "t2": {}}}).(*reporter)
@@ -191,8 +191,8 @@ func TestReporter_Degraded_Calc(t *testing.T) {
 		stat := reporter.getStatus()
 
 		assert.Equal(t, Degraded, stat.Status)
-		assert.Equal(t, Degraded, stat.Environments["t1"].Source.Status)
-		assert.Equal(t, Healthy, stat.Environments["t2"].Source.Status)
+		assert.Equal(t, Degraded, stat.SDKs["t1"].Source.Status)
+		assert.Equal(t, Healthy, stat.SDKs["t2"].Source.Status)
 	})
 }
 

diff --git a/web/router_status_test.go b/web/router_status_test.go
@@ -40,11 +40,11 @@ func TestStatus_Get_Body(t *testing.T) {
 	_ = json.Unmarshal(body, &stat)
 
 	assert.Equal(t, status.Healthy, stat.Status)
-	assert.Equal(t, status.Healthy, stat.Environments["test"].Source.Status)
-	assert.Equal(t, status.Online, stat.Environments["test"].Mode)
-	assert.Equal(t, 1, len(stat.Environments["test"].Source.Records))
-	assert.Contains(t, stat.Environments["test"].Source.Records[0], "config fetched")
-	assert.Equal(t, status.RemoteSrc, stat.Environments["test"].Source.Type)
+	assert.Equal(t, status.Healthy, stat.SDKs["test"].Source.Status)
+	assert.Equal(t, status.Online, stat.SDKs["test"].Mode)
+	assert.Equal(t, 1, len(stat.SDKs["test"].Source.Records))
+	assert.Contains(t, stat.SDKs["test"].Source.Records[0], "config fetched")
+	assert.Equal(t, status.RemoteSrc, stat.SDKs["test"].Source.Type)
 	assert.Equal(t, status.NA, stat.Cache.Status)
 	assert.Equal(t, 0, len(stat.Cache.Records))
 }