Merge pull request #1141 from valdar/issue/MGDCTRS-997

fix MGDCTRS-997: Admin API to list connectors with new revisions
bf2fc6cc711aee1a0c2a · Jun 29, 2022 · a1a2496 · a1a2496
2 parents 0ecff40 + 66ae690
commit a1a2496
Show file tree

Hide file tree

Showing 46 changed files with 1,340 additions and 1,256 deletions.
diff --git a/internal/connector/internal/api/admin/private/api/openapi.yaml b/internal/connector/internal/api/admin/private/api/openapi.yaml
diff --git a/internal/connector/internal/api/admin/private/api_connector_clusters_admin.go b/internal/connector/internal/api/admin/private/api_connector_clusters_admin.go
diff --git a/internal/connector/internal/api/admin/private/model_connector_available_operator_upgrade.go b/internal/connector/internal/api/admin/private/model_connector_available_operator_upgrade.go
@@ -11,9 +11,9 @@ package private
 
 // ConnectorAvailableOperatorUpgrade An available operator upgrade for a connector
 type ConnectorAvailableOperatorUpgrade struct {
-	ConnectorId     string                                    `json:"connector_id,omitempty"`
-	NamespaceId     string                                    `json:"namespace_id,omitempty"`
-	ConnectorTypeId string                                    `json:"connector_type_id,omitempty"`
-	Channel         string                                    `json:"channel,omitempty"`
-	Operator        ConnectorAvailableOperatorUpgradeOperator `json:"operator,omitempty"`
+	ConnectorId     string                 `json:"connector_id,omitempty"`
+	NamespaceId     string                 `json:"namespace_id,omitempty"`
+	ConnectorTypeId string                 `json:"connector_type_id,omitempty"`
+	Channel         string                 `json:"channel,omitempty"`
+	Operator        ConnectorUpgradeStatus `json:"operator,omitempty"`
 }
diff --git a/internal/connector/internal/api/admin/private/model_connector_available_type_upgrade.go b/internal/connector/internal/api/admin/private/model_connector_available_type_upgrade.go
diff --git a/internal/connector/internal/api/admin/private/model_connector_available_type_upgrade_list.go b/internal/connector/internal/api/admin/private/model_connector_available_type_upgrade_list.go
diff --git a/...ector/internal/api/admin/private/model_connector_available_type_upgrade_shard_metadata.go b/...ector/internal/api/admin/private/model_connector_available_type_upgrade_shard_metadata.go
diff --git a/internal/connector/internal/api/admin/private/model_connector_deployment_admin_status.go b/internal/connector/internal/api/admin/private/model_connector_deployment_admin_status.go
@@ -0,0 +1,19 @@
+/*
+ * Connector Service Fleet Manager Admin APIs
+ *
+ * Connector Service Fleet Manager Admin is a Rest API to manage connector clusters.
+ *
+ * API version: 0.0.3
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package private
+
+// ConnectorDeploymentAdminStatus The status of connector deployment
+type ConnectorDeploymentAdminStatus struct {
+	Phase           ConnectorState                              `json:"phase,omitempty"`
+	ResourceVersion int64                                       `json:"resource_version,omitempty"`
+	ShardMetadata   ConnectorDeploymentAdminStatusShardMetadata `json:"shard_metadata,omitempty"`
+	Operators       ConnectorDeploymentAdminStatusOperators     `json:"operators,omitempty"`
+	Conditions      []MetaV1Condition                           `json:"conditions,omitempty"`
+}
diff --git a/..._connector_deployment_status_operators.go → ...ctor_deployment_admin_status_operators.go b/..._connector_deployment_status_operators.go → ...ctor_deployment_admin_status_operators.go
@@ -9,8 +9,8 @@
 
 package private
 
-// ConnectorDeploymentStatusOperators struct for ConnectorDeploymentStatusOperators
-type ConnectorDeploymentStatusOperators struct {
+// ConnectorDeploymentAdminStatusOperators struct for ConnectorDeploymentAdminStatusOperators
+type ConnectorDeploymentAdminStatusOperators struct {
 	Assigned  ConnectorOperator `json:"assigned,omitempty"`
 	Available ConnectorOperator `json:"available,omitempty"`
 }
diff --git a/...ctor/internal/api/admin/private/model_connector_deployment_admin_status_shard_metadata.go b/...ctor/internal/api/admin/private/model_connector_deployment_admin_status_shard_metadata.go
@@ -0,0 +1,16 @@
+/*
+ * Connector Service Fleet Manager Admin APIs
+ *
+ * Connector Service Fleet Manager Admin is a Rest API to manage connector clusters.
+ *
+ * API version: 0.0.3
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package private
+
+// ConnectorDeploymentAdminStatusShardMetadata latest available revision of deployment shared metadata
+type ConnectorDeploymentAdminStatusShardMetadata struct {
+	Assigned  ConnectorShardMetadata `json:"assigned,omitempty"`
+	Available ConnectorShardMetadata `json:"available,omitempty"`
+}
diff --git a/internal/connector/internal/api/admin/private/model_connector_deployment_admin_view.go b/internal/connector/internal/api/admin/private/model_connector_deployment_admin_view.go
@@ -16,5 +16,5 @@ type ConnectorDeploymentAdminView struct {
 	Href     string                                    `json:"href,omitempty"`
 	Metadata ConnectorDeploymentAdminViewAllOfMetadata `json:"metadata,omitempty"`
 	Spec     ConnectorDeploymentAdminSpec              `json:"spec,omitempty"`
-	Status   ConnectorDeploymentStatus                 `json:"status,omitempty"`
+	Status   ConnectorDeploymentAdminStatus            `json:"status,omitempty"`
 }
diff --git a/internal/connector/internal/api/admin/private/model_connector_deployment_status.go b/internal/connector/internal/api/admin/private/model_connector_deployment_status.go
diff --git a/internal/connector/internal/api/admin/private/model_connector_shard_metadata.go b/internal/connector/internal/api/admin/private/model_connector_shard_metadata.go
@@ -0,0 +1,20 @@
+/*
+ * Connector Service Fleet Manager Admin APIs
+ *
+ * Connector Service Fleet Manager Admin is a Rest API to manage connector clusters.
+ *
+ * API version: 0.0.3
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package private
+
+// ConnectorShardMetadata identifies a shard metadata of a connector type.
+type ConnectorShardMetadata struct {
+	// the channel of the shard metadata
+	Channel string `json:"channel,omitempty"`
+	// the connector type id this shard metadata refers to
+	ConnectorTypeId string `json:"connector_type_id,omitempty"`
+	// the revision of the shard metadate
+	Revision int64 `json:"revision,omitempty"`
+}
diff --git a/...or_available_operator_upgrade_operator.go → ...private/model_connector_upgrade_status.go b/...or_available_operator_upgrade_operator.go → ...private/model_connector_upgrade_status.go
@@ -9,8 +9,8 @@
 
 package private
 
-// ConnectorAvailableOperatorUpgradeOperator struct for ConnectorAvailableOperatorUpgradeOperator
-type ConnectorAvailableOperatorUpgradeOperator struct {
+// ConnectorUpgradeStatus Assigned and available update ids
+type ConnectorUpgradeStatus struct {
 	AssignedId  string `json:"assigned_id,omitempty"`
 	AvailableId string `json:"available_id,omitempty"`
 }
diff --git a/internal/connector/internal/api/dbapi/connector.go b/internal/connector/internal/api/dbapi/connector.go
@@ -84,15 +84,17 @@ type ConnectorWithConditionsList []*ConnectorWithConditions
 // ConnectorDeployment Holds the deployment configuration of a connector
 type ConnectorDeployment struct {
 	db.Model
-	Version                int64
-	ConnectorID            string
-	OperatorID             string
-	ConnectorVersion       int64
-	ConnectorTypeChannelId int64
-	ClusterID              string
-	NamespaceID            string
-	AllowUpgrade           bool
-	Status                 ConnectorDeploymentStatus `gorm:"foreignKey:ID"`
+	Version                  int64
+	ConnectorID              string
+	Connector                Connector
+	OperatorID               string
+	ConnectorVersion         int64
+	ConnectorShardMetadataID int64
+	ConnectorShardMetadata   ConnectorShardMetadata
+	ClusterID                string
+	NamespaceID              string
+	AllowUpgrade             bool
+	Status                   ConnectorDeploymentStatus `gorm:"foreignKey:ID;references:ID"`
 }
 
 type ConnectorDeploymentList []ConnectorDeployment
@@ -122,22 +124,6 @@ type ServiceAccount struct {
 	ClientSecretRef string `gorm:"column:client_secret"`
 }
 
-type ConnectorDeploymentTypeUpgrade struct {
-	ConnectorID     string                `json:"connector_id,omitempty"`
-	DeploymentID    string                `json:"deployment_id,omitempty"`
-	ConnectorTypeId string                `json:"connector_type_id,omitempty"`
-	NamespaceID     string                `json:"namespace_id,omitempty"`
-	Channel         string                `json:"channel,omitempty"`
-	ShardMetadata   *ConnectorTypeUpgrade `json:"shard_metadata,omitempty"`
-}
-
-type ConnectorTypeUpgrade struct {
-	AssignedId  int64 `json:"assigned_id,omitempty"`
-	AvailableId int64 `json:"available_id,omitempty"`
-}
-
-type ConnectorDeploymentTypeUpgradeList []ConnectorDeploymentTypeUpgrade
-
 type ConnectorDeploymentOperatorUpgrade struct {
 	ConnectorID     string                    `json:"connector_id,omitempty"`
 	DeploymentID    string                    `json:"deployment_id,omitempty"`

diff --git a/internal/connector/internal/api/dbapi/connector_type.go b/internal/connector/internal/api/dbapi/connector_type.go
@@ -2,9 +2,10 @@ package dbapi
 
 import (
 	"encoding/json"
-	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/db"
 	"time"
 
+	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/db"
+
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/api"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/errors"
 	"gorm.io/gorm"
@@ -50,11 +51,12 @@ type ConnectorTypeCapability struct {
 }
 
 type ConnectorShardMetadata struct {
-	ID              int64    `gorm:"primaryKey:autoIncrement"`
-	ConnectorTypeId string   `gorm:"primaryKey"`
-	Channel         string   `gorm:"primaryKey"`
+	ID              int64  `gorm:"primaryKey:autoIncrement"`
+	ConnectorTypeId string `gorm:"index:idx_typeid_channel_revision;index:idx_typeid_channel"`
+	Channel         string `gorm:"index:idx_typeid_channel_revision;index:idx_typeid_channel"`
+	Revision        int64  `gorm:"index:idx_typeid_channel_revision;default:0"`
+	LatestRevision  *int64
 	ShardMetadata   api.JSON `gorm:"type:jsonb"`
-	LatestId        *int64
 }
 
 type ConnectorCatalogEntry struct {

diff --git a/internal/connector/internal/config/connectors.go b/internal/connector/internal/config/connectors.go
@@ -4,13 +4,14 @@ import (
 	"crypto/sha1"
 	"encoding/json"
 	"fmt"
-	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/shared/utils/files"
 	"io/fs"
 	"io/ioutil"
 	"os"
 	"sort"
 	"strings"
 
+	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/shared/utils/files"
+
 	gherrors "github.com/pkg/errors"
 
 	"time"
@@ -35,7 +36,6 @@ type ConnectorsConfig struct {
 var _ environments.ConfigModule = &ConnectorsConfig{}
 
 type ConnectorChannelConfig struct {
-	Revision      int64                  `json:"revision,omitempty"`
 	ShardMetadata map[string]interface{} `json:"shard_metadata,omitempty"`
 }
 

diff --git a/internal/connector/internal/environments/integration.go b/internal/connector/internal/environments/integration.go
@@ -43,6 +43,7 @@ func (b IntegrationEnvLoader) Defaults() map[string]string {
 func (b IntegrationEnvLoader) ModifyConfiguration(env *environments.Env) error {
 	// Support a one-off env to allow enabling db debug in testing
 	var databaseConfig *db.DatabaseConfig
+	env.MustResolveAll(&databaseConfig)
 	if os.Getenv("DB_DEBUG") == "true" {
 		databaseConfig.Debug = true
 	}