[HOTFIX] Support oauth2ClientCredentials destinations in the Destinat…

…ions Creator Operator (#3515)

* Cherrypick and resolution of conflicts

* Bump versions

* Delete unused imports

chart/compass/values.yaml

@@ -167,8 +167,8 @@ global:
       version: "v20231121-e91239f0"
       name: compass-pairing-adapter
     director:
-      dir: prod/incubator/
-      version: "v20231128-76050135"
+      dir: dev/incubator/
+      version: "PR-3515"
       name: compass-director
     hydrator:
       dir: prod/incubator/
@@ -216,16 +216,16 @@ global:
       dir:
       version: "0a651695"
     external_services_mock:
-      dir: prod/incubator/
-      version: "v20231128-10ebaa4f"
+      dir: dev/incubator/
+      version: "PR-3515"
       name: compass-external-services-mock
     console:
       dir: prod/incubator/
       version: "v20230421-e8840c18"
       name: compass-console
     e2e_tests:
-      dir: prod/incubator/
-      version: "v20231128-10ebaa4f"
+      dir: dev/incubator/
+      version: "PR-3515"
       name: compass-e2e-tests
   isLocalEnv: false
   isForTesting: false

components/director/internal/destinationcreator/fixtures_test.go

@@ -25,6 +25,7 @@ const (
 	samlAssertionDestName            = "test-saml-assertion-dest-name"
 	samlAssertionDestURL             = "test-saml-assertion-dest-url"
 	clientCertAuthDestName           = "test-client-cert-auth-dest-name"
+	oauth2ClientCredsDestName        = "test-oauth2-client-creds-dest-name"
 	destinationDescription           = "test-dest-description"
 	destinationTypeHTTP              = string(destinationcreatorpkg.TypeHTTP)
 	destinationProxyTypeInternet     = string(destinationcreatorpkg.ProxyTypeInternet)
@@ -38,6 +39,10 @@ const (
 	basicDestURL                     = "basic-url"
 	basicDestUser                    = "basic-user"
 	basicDestPassword                = "basic-pwd"
+	oauth2ClientCredsURL             = "oauth2-url"
+	oauth2ClientCredsTokenURL        = "oauth2-token-url"
+	oauth2ClientCredsClientID        = "oauth2-client-id"
+	oauth2ClientCredsClientSecret    = "oauth2-client-secret"
 
 	// Destination Certificate constants
 	certificateName            = "testCertificateName"
@@ -75,6 +80,7 @@ var (
 	appTemplateID   = "testAppTemplateID"
 	appBaseURL      = "http://app-test-base-url"
 	appEmptyBaseURL = ""
+	testURLPath     = "/test/path"
 
 	TestEmptyErrorValueRawJSON = json.RawMessage(`\"\"`)
 	TestConfigValueRawJSON     = json.RawMessage(`{"configKey":"configValue"}`)
@@ -172,6 +178,14 @@ func fixDestinationConfig() *destinationcreator.Config {
 	}
 }
 
+func fixDestinationInfo(authType, destType, url string) *destinationcreatorpkg.DestinationInfo {
+	return &destinationcreatorpkg.DestinationInfo{
+		AuthenticationType: destinationcreatorpkg.AuthType(authType),
+		Type:               destinationcreatorpkg.Type(destType),
+		URL:                url,
+	}
+}
+
 func fixDesignTimeDestinationDetails() operators.Destination {
 	return fixDestinationDetails(designTimeDestName, string(destinationcreatorpkg.AuthTypeNoAuth), destinationExternalSubaccountID)
 }
@@ -194,6 +208,12 @@ func fixClientCertAuthDestinationDetails() operators.Destination {
 	return fixDestinationDetails(clientCertAuthDestName, string(destinationcreatorpkg.AuthTypeClientCertificate), destinationExternalSubaccountID)
 }
 
+func fixOAuth2ClientCredsDestinationDetails() operators.Destination {
+	dest := fixDestinationDetails(oauth2ClientCredsDestName, string(destinationcreatorpkg.AuthTypeOAuth2ClientCredentials), destinationExternalSubaccountID)
+	dest.TokenServiceURLType = string(destinationcreatorpkg.DedicatedTokenServiceURLType)
+	return dest
+}
+
 func fixDestinationsDetailsWithoutSubaccountID() []operators.Destination {
 	return []operators.Destination{
 		fixDestinationDetails(samlAssertionDestName, string(destinationcreatorpkg.AuthTypeSAMLAssertion), ""),
@@ -233,6 +253,15 @@ func fixSAMLAssertionAuthCreds(url string) *operators.SAMLAssertionAuthenticatio
 	}
 }
 
+func fixOAuth2ClientCreds(url, tokenServiceURL, clientID, clientSecret string) *operators.OAuth2ClientCredentialsAuthentication {
+	return &operators.OAuth2ClientCredentialsAuthentication{
+		URL:             url,
+		TokenServiceURL: tokenServiceURL,
+		ClientID:        clientID,
+		ClientSecret:    clientSecret,
+	}
+}
+
 func fixClientCertAuthTypeCreds() *operators.ClientCertAuthentication {
 	return &operators.ClientCertAuthentication{URL: destinationURL}
 }