fix: check every config entry in a file (#1628)

* fix: on authentication, validation check every config entry in a file and improve test
Dynatrace · Nov 13, 2024 · e565222 · e565222
1 parent 5cd8e2c
commit e565222
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/cmd/monaco/deploy/deploy.go b/cmd/monaco/deploy/deploy.go
@@ -281,20 +281,22 @@ func platformEnvironment(e manifest.EnvironmentDefinition) bool {
 func validateAuthenticationWithProjectConfigs(projects []project.Project, environments manifest.Environments) error {
 	for _, p := range projects {
 		for envName, env := range p.Configs {
-			for _, conf := range env {
-				if conf[0].Skip == true {
-					continue
-				}
-
-				switch conf[0].Type.(type) {
-				case config.ClassicApiType,
-					config.SettingsType:
-					if environments[envName].Auth.Token == nil {
-						return fmt.Errorf("API of type '%s' requires a token for environment '%s'", conf[0].Type, envName)
+			for _, file := range env {
+				for _, conf := range file {
+					if conf.Skip == true {
+						continue
 					}
-				default:
-					if environments[envName].Auth.OAuth == nil {
-						return fmt.Errorf("API of type '%s' requires OAuth for environment '%s'", conf[0].Type, envName)
+
+					switch conf.Type.(type) {
+					case config.ClassicApiType,
+						config.SettingsType:
+						if environments[envName].Auth.Token == nil {
+							return fmt.Errorf("API of type '%s' requires a token for environment '%s'", conf.Type, envName)
+						}
+					default:
+						if environments[envName].Auth.OAuth == nil {
+							return fmt.Errorf("API of type '%s' requires OAuth for environment '%s'", conf.Type, envName)
+						}
 					}
 				}
 			}

diff --git a/cmd/monaco/deploy/deploy_test.go b/cmd/monaco/deploy/deploy_test.go
@@ -396,7 +396,7 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 	classicConfSkip := classicConf
 	classicConfSkip.Skip = true
 	documentConfSkip := documentConf
-	classicConfSkip.Skip = true
+	documentConfSkip.Skip = true
 
 	success_tests := []struct {
 		name                 string
@@ -413,7 +413,7 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 						OAuth: &oAuth},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{documentConf}},
+				string(config.DocumentTypeId): []config.Config{documentConf}},
 			"",
 		},
 		{
@@ -425,7 +425,7 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 						Token: &token},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{classicConf}},
+				string(config.ClassicApiTypeId): []config.Config{classicConf}},
 			"",
 		},
 		{
@@ -439,7 +439,9 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 					},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{classicConf, documentConf}},
+				string(config.DocumentTypeId):   []config.Config{documentConf},
+				string(config.ClassicApiTypeId): []config.Config{classicConf, classicConfSkip},
+			},
 			"",
 		},
 		{
@@ -451,7 +453,7 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 						Token: &token},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{documentConf}},
+				string(config.DocumentTypeId): []config.Config{documentConf}},
 			"requires OAuth for environment",
 		},
 		{
@@ -463,7 +465,9 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 						OAuth: &oAuth},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{classicConf, documentConf}},
+				string(config.DocumentTypeId):   []config.Config{documentConf},
+				string(config.ClassicApiTypeId): []config.Config{classicConf},
+			},
 			"requires a token for environment",
 		},
 		{
@@ -487,7 +491,9 @@ func Test_ValidateAuthenticationWithProjectConfigs(t *testing.T) {
 						Token: &token},
 				}},
 			project.ConfigsPerType{
-				"dashboard": []config.Config{classicConf, documentConfSkip}},
+				string(config.DocumentTypeId):   []config.Config{documentConfSkip},
+				string(config.ClassicApiTypeId): []config.Config{classicConf},
+			},
 			"",
 		},
 	}