test: Update tests for platform token enabled by default

Author: arthurpitman

cmd/monaco/download/download_command_test.go

@@ -85,17 +85,17 @@ func TestGetDownloadCommand(t *testing.T) {
 
 	t.Run("Download using manifest - access token cannot be specified", func(t *testing.T) {
 		err := newMonaco(t).download("--token API_TOKEN")
-		assert.EqualError(t, err, "'--token', '--oauth-client-id', and '--oauth-client-secret' can only be used with '--url', while '--manifest' must NOT be set")
+		assert.EqualError(t, err, "'--token', '--oauth-client-id', '--oauth-client-secret', and '--platform-token' can only be used with '--url', while '--manifest' must NOT be set")
 	})
 
 	t.Run("Download using manifest - OAuth client ID cannot be specified", func(t *testing.T) {
 		err := newMonaco(t).download("--oauth-client-id CLIENT_ID")
-		assert.EqualError(t, err, "'--token', '--oauth-client-id', and '--oauth-client-secret' can only be used with '--url', while '--manifest' must NOT be set")
+		assert.EqualError(t, err, "'--token', '--oauth-client-id', '--oauth-client-secret', and '--platform-token' can only be used with '--url', while '--manifest' must NOT be set")
 	})
 
 	t.Run("Download using manifest - OAuth client secret cannot be specified", func(t *testing.T) {
 		err := newMonaco(t).download("--oauth-client-secret CLIENT_SECRET")
-		assert.EqualError(t, err, "'--token', '--oauth-client-id', and '--oauth-client-secret' can only be used with '--url', while '--manifest' must NOT be set")
+		assert.EqualError(t, err, "'--token', '--oauth-client-id', '--oauth-client-secret', and '--platform-token' can only be used with '--url', while '--manifest' must NOT be set")
 	})
 
 	t.Run("Download using manifest - platform token cannot be specified", func(t *testing.T) {
@@ -195,6 +195,7 @@ func TestGetDownloadCommand(t *testing.T) {
 	})
 
 	t.Run("Direct download - missing token or OAuth credentials", func(t *testing.T) {
+		t.Setenv(featureflags.PlatformToken.EnvName(), "false")
 		err := newMonaco(t).download("--url http://some.url")
 		assert.EqualError(t, err, "if '--url' is set, '--token' or '--oauth-client-id' and '--oauth-client-secret' must also be set")
 	})

pkg/manifest/loader/manifest_loader_test.go

@@ -1869,54 +1869,6 @@ environmentGroups: [{name: b, environments: [{name: c, url: {value: d}}]}]
 `,
 			errsContain: []string{ErrNoCredentials.Error()},
 		},
-		{
-			name:            "Only platform auth configured with disabled FF",
-			manifestContent: platformManifest,
-			errsContain:     []string{ErrNoCredentials.Error()},
-		},
-		{
-			name:            "platform and OAuth configured with disabled FF does not fail",
-			manifestContent: platformAndOAuthManifest,
-			expectedManifest: manifest.Manifest{
-				Projects: map[string]manifest.ProjectDefinition{
-					"a": {
-						Name: "a",
-						Path: "a",
-					},
-				},
-				Environments: manifest.Environments{
-					SelectedEnvironments: map[string]manifest.EnvironmentDefinition{
-						"c": {
-							Name: "c",
-							URL: manifest.URLDefinition{
-								Type:  manifest.ValueURLType,
-								Value: "d",
-							},
-							Group: "b",
-							Auth: manifest.Auth{
-								OAuth: &manifest.OAuth{
-									ClientID: manifest.AuthSecret{
-										Name:  "client-id",
-										Value: "resolved-client-id",
-									},
-									ClientSecret: manifest.AuthSecret{
-										Name:  "client-secret",
-										Value: "resolved-client-secret",
-									},
-								},
-							},
-						},
-					},
-					AllEnvironmentNames: map[string]struct{}{
-						"c": {},
-					},
-					AllGroupNames: map[string]struct{}{
-						"b": {},
-					},
-				},
-				Accounts: map[string]manifest.Account{},
-			},
-		},
 		{
 			name: "Unknown type",
 			manifestContent: `
@@ -2067,6 +2019,86 @@ environmentGroups: [{name: b, environments: [{name: c, url: {value: d}, auth: {t
 	}
 }
 
+// TestLoadManifestWithPlatformTokenFeatureFlagDisabled tests manifest loading when platform token FF is explicitly disabled.
+func TestLoadManifestWithPlatformTokenFeatureFlagDisabled(t *testing.T) {
+	t.Setenv(featureflags.PlatformToken.EnvName(), "false")
+
+	t.Setenv("e", "mock token")
+	t.Setenv("token-env-var", "mock token")
+	t.Setenv("empty-env-var", "")
+	t.Setenv("client-id", "resolved-client-id")
+	t.Setenv("client-secret", "resolved-client-secret")
+	t.Setenv("ENV_OAUTH_ENDPOINT", "resolved-oauth-endpoint")
+
+	t.Run("Fails if only platform token provided", func(t *testing.T) {
+		fs := afero.NewMemMapFs()
+		assert.NoError(t, afero.WriteFile(fs, "manifest.yaml", []byte(platformManifest), 0400))
+
+		mani, errs := Load(&Context{
+			Fs:           fs,
+			ManifestPath: "manifest.yaml",
+		})
+
+		assert.Equal(t, manifest.Manifest{}, mani)
+		require.Len(t, errs, 1)
+		assert.ErrorContains(t, errs[0], ErrNoCredentials.Error())
+	})
+
+	t.Run("Succeeds if both platform token and oauth provided", func(t *testing.T) {
+
+		fs := afero.NewMemMapFs()
+		assert.NoError(t, afero.WriteFile(fs, "manifest.yaml", []byte(platformAndOAuthManifest), 0400))
+
+		mani, errs := Load(&Context{
+			Fs:           fs,
+			ManifestPath: "manifest.yaml",
+		})
+
+		expectedManifest := manifest.Manifest{
+			Projects: map[string]manifest.ProjectDefinition{
+				"a": {
+					Name: "a",
+					Path: "a",
+				},
+			},
+			Environments: manifest.Environments{
+				SelectedEnvironments: map[string]manifest.EnvironmentDefinition{
+					"c": {
+						Name: "c",
+						URL: manifest.URLDefinition{
+							Type:  manifest.ValueURLType,
+							Value: "d",
+						},
+						Group: "b",
+						Auth: manifest.Auth{
+							OAuth: &manifest.OAuth{
+								ClientID: manifest.AuthSecret{
+									Name:  "client-id",
+									Value: "resolved-client-id",
+								},
+								ClientSecret: manifest.AuthSecret{
+									Name:  "client-secret",
+									Value: "resolved-client-secret",
+								},
+							},
+						},
+					},
+				},
+				AllEnvironmentNames: map[string]struct{}{
+					"c": {},
+				},
+				AllGroupNames: map[string]struct{}{
+					"b": {},
+				},
+			},
+			Accounts: map[string]manifest.Account{},
+		}
+
+		assert.Equal(t, expectedManifest, mani)
+		assert.Empty(t, errs)
+	})
+}
+
 func TestLoadManifest_WithPlatformTokenSupport(t *testing.T) {
 	t.Setenv(featureflags.PlatformToken.EnvName(), "true")
 	t.Setenv("e", "mock token")