Move "databaseName" specification from the database-integration to th…

…e database-typed intent. (#299)

src/operator/api/v1alpha2/clientintents_webhook.go

@@ -53,6 +53,7 @@ func convertDatabaseResourcesV1alpha2toV1alpha3(srcResources []DatabaseResource)
 	dstResources := make([]v1alpha3.DatabaseResource, len(srcResources))
 	for i, resource := range srcResources {
 		dstResources[i].Table = resource.Table
+		dstResources[i].DatabaseName = resource.DatabaseName
 		dstResources[i].Operations = lo.Map(resource.Operations, func(operation DatabaseOperation, _ int) v1alpha3.DatabaseOperation {
 			return v1alpha3.DatabaseOperation(operation)
 		})
@@ -102,6 +103,7 @@ func (in *ClientIntents) ConvertFrom(srcRaw conversion.Hub) error {
 func convertDatabaseResourcesV1alpha3toV1alpha2(srcResources []v1alpha3.DatabaseResource) []DatabaseResource {
 	dstResources := make([]DatabaseResource, len(srcResources))
 	for i, resource := range srcResources {
+		dstResources[i].DatabaseName = resource.DatabaseName
 		dstResources[i].Table = resource.Table
 		dstResources[i].Operations = lo.Map(resource.Operations, func(operation v1alpha3.DatabaseOperation, _ int) DatabaseOperation {
 			return DatabaseOperation(operation)

src/operator/api/v1alpha2/intents_types.go

@@ -150,8 +150,9 @@ type Intent struct {
 }
 
 type DatabaseResource struct {
-	Table      string              `json:"table" yaml:"table"`
-	Operations []DatabaseOperation `json:"operations" yaml:"operations"`
+	DatabaseName string              `json:"databaseName" yaml:"databaseName"`
+	Table        string              `json:"table" yaml:"table"`
+	Operations   []DatabaseOperation `json:"operations" yaml:"operations"`
 }
 
 type HTTPResource struct {

src/operator/api/v1alpha3/clientintents_types.go

@@ -162,8 +162,9 @@ type Intent struct {
 }
 
 type DatabaseResource struct {
-	Table      string              `json:"table" yaml:"table"`
-	Operations []DatabaseOperation `json:"operations" yaml:"operations"`
+	DatabaseName string              `json:"databaseName" yaml:"databaseName"`
+	Table        string              `json:"table" yaml:"table"`
+	Operations   []DatabaseOperation `json:"operations" yaml:"operations"`
 }
 
 type HTTPResource struct {
@@ -484,7 +485,8 @@ func (in *Intent) ConvertToCloudFormat(resourceNamespace string, clientName stri
 	if in.DatabaseResources != nil {
 		intentInput.DatabaseResources = lo.Map(in.DatabaseResources, func(resource DatabaseResource, _ int) *graphqlclient.DatabaseConfigInput {
 			databaseConfigInput := graphqlclient.DatabaseConfigInput{
-				Table: lo.ToPtr(resource.Table),
+				Table:  lo.ToPtr(resource.Table),
+				Dbname: lo.ToPtr(resource.DatabaseName),
 				Operations: lo.Map(resource.Operations, func(operation DatabaseOperation, _ int) *graphqlclient.DatabaseOperation {
 					cloudOperation := databaseOperationToCloud(operation)
 					return &cloudOperation

src/operator/config/crd/k8s.otterize.com_clientintents.yaml

@@ -41,6 +41,8 @@ spec:
                     databaseResources:
                       items:
                         properties:
+                          databaseName:
+                            type: string
                           operations:
                             items:
                               enum:
@@ -54,6 +56,7 @@ spec:
                           table:
                             type: string
                         required:
+                        - databaseName
                         - operations
                         - table
                         type: object
@@ -196,6 +199,8 @@ spec:
                     databaseResources:
                       items:
                         properties:
+                          databaseName:
+                            type: string
                           operations:
                             items:
                               enum:
@@ -209,6 +214,7 @@ spec:
                           table:
                             type: string
                         required:
+                        - databaseName
                         - operations
                         - table
                         type: object

src/operator/controllers/intents_reconcilers/exp/database_test.go

@@ -24,6 +24,7 @@ const (
 	clientName        string = "test-client"
 	integrationName   string = "test-integration"
 	tableName         string = "test-table"
+	dbName            string = "testdb"
 )
 
 type DatabaseReconcilerTestSuite struct {
@@ -85,7 +86,8 @@ func (s *DatabaseReconcilerTestSuite) TestSimpleDatabase() {
 					Name: integrationName,
 					Type: otterizev1alpha3.IntentTypeDatabase,
 					DatabaseResources: []otterizev1alpha3.DatabaseResource{{
-						Table: tableName,
+						DatabaseName: dbName,
+						Table:        tableName,
 						Operations: []otterizev1alpha3.DatabaseOperation{
 							otterizev1alpha3.DatabaseOperationSelect,
 							otterizev1alpha3.DatabaseOperationInsert,
@@ -103,7 +105,8 @@ func (s *DatabaseReconcilerTestSuite) TestSimpleDatabase() {
 		ServerNamespace: lo.ToPtr(testNamespace),
 		Type:            lo.ToPtr(graphqlclient.IntentTypeDatabase),
 		DatabaseResources: []*graphqlclient.DatabaseConfigInput{{
-			Table: lo.ToPtr(tableName),
+			Table:  lo.ToPtr(tableName),
+			Dbname: lo.ToPtr(dbName),
 			Operations: []*graphqlclient.DatabaseOperation{
 				lo.ToPtr(graphqlclient.DatabaseOperationSelect),
 				lo.ToPtr(graphqlclient.DatabaseOperationInsert),

src/operator/otterizecrds/clientintents-customresourcedefinition.yaml

@@ -46,6 +46,8 @@ spec:
                       databaseResources:
                         items:
                           properties:
+                            databaseName:
+                              type: string
                             operations:
                               items:
                                 enum:
@@ -59,6 +61,7 @@ spec:
                             table:
                               type: string
                           required:
+                            - databaseName
                             - operations
                             - table
                           type: object
@@ -196,6 +199,8 @@ spec:
                       databaseResources:
                         items:
                           properties:
+                            databaseName:
+                              type: string
                             operations:
                               items:
                                 enum:
@@ -209,6 +214,7 @@ spec:
                             table:
                               type: string
                           required:
+                            - databaseName
                             - operations
                             - table
                           type: object

src/shared/otterizecloud/graphqlclient/generate.go

@@ -2,5 +2,5 @@ package graphqlclient
 
 import _ "github.com/suessflorian/gqlfetch"
 
-//go:generate sh -c "go run github.com/suessflorian/gqlfetch/gqlfetch --endpoint https://app.staging.otterize.com/api/graphql/v1beta > schema.graphql"
+//go:generate sh -c "go run github.com/suessflorian/gqlfetch/gqlfetch --endpoint http://app.staging.otterize.com/api/graphql/v1beta > schema.graphql"
 //go:generate go run github.com/Khan/genqlient ./genqlient.yaml