use existing const in tests

Signed-off-by: Joni Collinge <jonathancollinge@live.com>
dapr · Jan 15, 2022 · 6976d3a · 6976d3a
1 parent 2f24888
commit 6976d3a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 36 deletions.
diff --git a/pkg/kubernetes/injector.go b/pkg/kubernetes/injector.go
@@ -95,6 +95,7 @@ func NewK8sInjector(config K8sInjectorConfig) *K8sInjector {
 	}
 }
 
+// Inject injects dapr annotations into the kubernetes resource.
 func (p *K8sInjector) Inject(inputs []io.Reader, out io.Writer, opts InjectOptions) error {
 	for _, input := range inputs {
 		err := p.processInput(input, out, opts)
@@ -120,7 +121,7 @@ func (p *K8sInjector) processInput(input io.Reader, out io.Writer, opts InjectOp
 			return err
 		}
 
-		// determine type first so that subsequent unmarshal can use correct version.
+		// Check if the input is a list.
 		var metaType metav1.TypeMeta
 		if err = yaml.Unmarshal(bytes, &metaType); err != nil {
 			return err

diff --git a/pkg/kubernetes/injector_test.go b/pkg/kubernetes/injector_test.go
@@ -25,7 +25,7 @@ func TestInject(t *testing.T) {
 		expectedFilePath string
 	}{
 		{
-			testID: "single targeted injection into pod config 1",
+			testID: "single targeted injection into pod config 1 from stdin",
 			injections: []injection{
 				{
 					targetName: "mypod",
@@ -302,39 +302,39 @@ func TestGetDaprAnnotations(t *testing.T) {
 
 		annotations := getDaprAnnotations(&config)
 
-		assert.Equal(t, annotations["dapr.io/enabled"], "true")
-		assert.Equal(t, annotations["dapr.io/app-id"], "test-app")
-		assert.Equal(t, annotations["dapr.io/app-port"], "8080")
-		assert.Equal(t, annotations["dapr.io/config"], "test-config")
-		assert.Equal(t, annotations["dapr.io/app-protocol"], "http")
-		assert.Equal(t, annotations["dapr.io/enable-profiling"], "true")
-		assert.Equal(t, annotations["dapr.io/log-level"], "debug")
-		assert.Equal(t, annotations["dapr.io/api-token-secret"], "test-api-token")
-		assert.Equal(t, annotations["dapr.io/app-token-secret"], "test-app-token")
-		assert.Equal(t, annotations["dapr.io/log-as-json"], "true")
-		assert.Equal(t, annotations["dapr.io/app-max-concurrency"], "8")
-		assert.Equal(t, annotations["dapr.io/enable-metrics"], "true")
-		assert.Equal(t, annotations["dapr.io/metrics-port"], "9090")
-		assert.Equal(t, annotations["dapr.io/enable-debug"], "true")
-		assert.Equal(t, annotations["dapr.io/env"], "key=value,key1=value1")
-		assert.Equal(t, annotations["dapr.io/sidecar-cpu-limit"], "0.5")
-		assert.Equal(t, annotations["dapr.io/sidecar-memory-limit"], "512Mi")
-		assert.Equal(t, annotations["dapr.io/sidecar-cpu-request"], "0.1")
-		assert.Equal(t, annotations["dapr.io/sidecar-memory-request"], "256Mi")
-		assert.Equal(t, annotations["dapr.io/sidecar-listen-addresses"], "0.0.0.0")
-		assert.Equal(t, annotations["dapr.io/sidecar-liveness-probe-delay-seconds"], "10")
-		assert.Equal(t, annotations["dapr.io/sidecar-liveness-probe-timeout-seconds"], "10")
-		assert.Equal(t, annotations["dapr.io/sidecar-liveness-probe-period-seconds"], "30")
-		assert.Equal(t, annotations["dapr.io/sidecar-liveness-probe-threshold"], "15")
-		assert.Equal(t, annotations["dapr.io/sidecar-readiness-probe-delay-seconds"], "10")
-		assert.Equal(t, annotations["dapr.io/sidecar-readiness-probe-timeout-seconds"], "10")
-		assert.Equal(t, annotations["dapr.io/sidecar-readiness-probe-period-seconds"], "30")
-		assert.Equal(t, annotations["dapr.io/sidecar-readiness-probe-threshold"], "15")
-		assert.Equal(t, annotations["dapr.io/sidecar-image"], "test-image")
-		assert.Equal(t, annotations["dapr.io/app-ssl"], "true")
-		assert.Equal(t, annotations["dapr.io/http-max-request-size"], "8")
-		assert.Equal(t, annotations["dapr.io/http-read-buffer-size"], "4")
-		assert.Equal(t, annotations["dapr.io/http-stream-request-body"], "true")
-		assert.Equal(t, annotations["dapr.io/graceful-shutdown-seconds"], "10")
+		assert.Equal(t, annotations[daprEnabledKey], "true")
+		assert.Equal(t, annotations[daprAppIDKey], "test-app")
+		assert.Equal(t, annotations[daprAppPortKey], "8080")
+		assert.Equal(t, annotations[daprConfigKey], "test-config")
+		assert.Equal(t, annotations[daprAppProtocolKey], "http")
+		assert.Equal(t, annotations[daprEnableProfilingKey], "true")
+		assert.Equal(t, annotations[daprLogLevelKey], "debug")
+		assert.Equal(t, annotations[daprAPITokenSecretKey], "test-api-token")
+		assert.Equal(t, annotations[daprAppTokenSecretKey], "test-app-token")
+		assert.Equal(t, annotations[daprLogLevelKey], "true")
+		assert.Equal(t, annotations[daprAppMaxConcurrencyKey], "8")
+		assert.Equal(t, annotations[daprEnableMetricsKey], "true")
+		assert.Equal(t, annotations[daprMetricsPortKey], "9090")
+		assert.Equal(t, annotations[daprDebugPortKey], "true")
+		assert.Equal(t, annotations[daprEnvKey], "key=value,key1=value1")
+		assert.Equal(t, annotations[daprCPULimitKey], "0.5")
+		assert.Equal(t, annotations[daprMemoryLimitKey], "512Mi")
+		assert.Equal(t, annotations[daprCPURequestKey], "0.1")
+		assert.Equal(t, annotations[daprMemoryRequestKey], "256Mi")
+		assert.Equal(t, annotations[daprListenAddressesKey], "0.0.0.0")
+		assert.Equal(t, annotations[daprLivenessProbeDelayKey], "10")
+		assert.Equal(t, annotations[daprLivenessProbeTimeoutKey], "10")
+		assert.Equal(t, annotations[daprLivenessProbeDelayKey], "30")
+		assert.Equal(t, annotations[daprLivenessProbeThresholdKey], "15")
+		assert.Equal(t, annotations[daprReadinessProbeDelayKey], "10")
+		assert.Equal(t, annotations[daprReadinessProbeTimeoutKey], "10")
+		assert.Equal(t, annotations[daprReadinessProbePeriodKey], "30")
+		assert.Equal(t, annotations[daprReadinessProbeThresholdKey], "15")
+		assert.Equal(t, annotations[daprImageKey], "test-image")
+		assert.Equal(t, annotations[daprAppSSLKey], "true")
+		assert.Equal(t, annotations[daprMaxRequestBodySizeKey], "8")
+		assert.Equal(t, annotations[daprReadBufferSizeKey], "4")
+		assert.Equal(t, annotations[daprHTTPStreamRequestBodyKey], "true")
+		assert.Equal(t, annotations[daprGracefulShutdownSecondsKey], "10")
 	})
 }