[feat]: [DBOPS-845]: Support for ServiceAccountToken JDBC connector (#…

…630)
harness · Jan 24, 2025 · d3172de · d3172de
1 parent 432f8fd
commit d3172de
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 7 deletions.
diff --git a/harness/nextgen/docs/JdbcServiceAccountDto.md b/harness/nextgen/docs/JdbcServiceAccountDto.md
@@ -0,0 +1,9 @@
+# JdbcServiceAccountDto
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ServiceAccountTokenRef** | **string** |  | [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/harness/nextgen/enum_jdbc_auth_types.go b/harness/nextgen/enum_jdbc_auth_types.go
@@ -4,8 +4,10 @@ type JDBCAuthType string
 
 var JDBCAuthTypes = struct {
 	UsernamePassword JDBCAuthType
+	ServiceAccount   JDBCAuthType
 }{
 	UsernamePassword: "UsernamePassword",
+	ServiceAccount:   "ServiceAccount",
 }
 
 func (e JDBCAuthType) String() string {

diff --git a/harness/nextgen/model_jdbc_authentication_dto.go b/harness/nextgen/model_jdbc_authentication_dto.go
@@ -15,5 +15,6 @@ import "encoding/json"
 type JdbcAuthenticationDto struct {
 	Type_            JDBCAuthType             `json:"type"`
 	UsernamePassword *JdbcUserNamePasswordDto `json:"-"`
+	ServiceAccount   *JdbcServiceAccountDto   `json:"-"`
 	Spec             json.RawMessage          `json:"spec,omitempty"`
 }
diff --git a/harness/nextgen/model_jdbc_authentication_serializer.go b/harness/nextgen/model_jdbc_authentication_serializer.go
@@ -2,6 +2,7 @@ package nextgen
 
 import (
 	"encoding/json"
+	"fmt"
 )
 
 func (a *JdbcAuthenticationDto) UnmarshalJSON(data []byte) error {
@@ -19,7 +20,14 @@ func (a *JdbcAuthenticationDto) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	err = json.Unmarshal(aux.Spec, &a.UsernamePassword)
+	switch a.Type_ {
+	case JDBCAuthTypes.UsernamePassword:
+		err = json.Unmarshal(aux.Spec, &a.UsernamePassword)
+	case JDBCAuthTypes.ServiceAccount:
+		err = json.Unmarshal(aux.Spec, &a.ServiceAccount)
+	default:
+		panic(fmt.Sprintf("unknown jdbc auth method type %s", a.Type_))
+	}
 
 	return err
 }
@@ -30,7 +38,14 @@ func (a *JdbcAuthenticationDto) MarshalJSON() ([]byte, error) {
 	var spec []byte
 	var err error
 
-	spec, err = json.Marshal(a.UsernamePassword)
+	switch a.Type_ {
+	case JDBCAuthTypes.UsernamePassword:
+		spec, err = json.Marshal(a.UsernamePassword)
+	case JDBCAuthTypes.ServiceAccount:
+		spec, err = json.Marshal(a.ServiceAccount)
+	default:
+		panic(fmt.Sprintf("unknown jdbc auth method type %s", a.Type_))
+	}
 
 	if err != nil {
 		return nil, err

diff --git a/harness/nextgen/model_jdbc_connector.go b/harness/nextgen/model_jdbc_connector.go
@@ -11,9 +11,9 @@ package nextgen
 
 // This contains details of the JDBC connector
 type JdbcConnector struct {
-	Url               string                 `json:"url"`
-	Auth              *JdbcAuthenticationDto `json:"auth,omitempty"`
-	DelegateSelectors []string               `json:"delegateSelectors,omitempty"`
-	ConnectorType     string                 `json:"connectorType"`
-	ExecuteOnDelegate bool                   `json:"executeOnDelegate"`
+	Url                  string                 `json:"url"`
+	Auth                 *JdbcAuthenticationDto `json:"auth,omitempty"`
+	DelegateSelectors    []string               `json:"delegateSelectors,omitempty"`
+	ExecuteOnDelegate    bool                   `json:"executeOnDelegate"`
+	IgnoreTestConnection bool                   `json:"ignoreTestConnection,omitempty"`
 }
diff --git a/harness/nextgen/model_jdbc_service_account_dto.go b/harness/nextgen/model_jdbc_service_account_dto.go
@@ -0,0 +1,14 @@
+/*
+ * Harness NextGen Software Delivery Platform API Reference
+ *
+ * This is the Open Api Spec 3 for the NextGen Manager. This is under active development. Beware of the breaking change with respect to the generated code stub
+ *
+ * API version: 3.0
+ * Contact: contact@harness.io
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+package nextgen
+
+type JdbcServiceAccountDto struct {
+	ServiceAccountTokenRef string `json:"serviceAccountTokenRef"`
+}