From e55bf9b20e6a5367f425836255cc155aedfdceba Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 1 Nov 2023 16:32:05 -0700 Subject: [PATCH] Bring back GetRequestType() Signed-off-by: Tamal Saha --- .../ops/v1alpha1/elasticsearch_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/etcd_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/kafka_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/mariadb_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/memcached_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/mongodb_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/mysql_ops_helpers.go | 4 ++++ .../ops/v1alpha1/perconaxtradb_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/pgbouncer_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/postgres_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/proxysql_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/redis_ops_helpers.go | 4 ++++ .../v1alpha1/redis_sentinel_ops_helpers.go | 4 ++++ apis/ops/v1alpha1/type.go | 1 + openapi/swagger.json | 24 ------------------- 15 files changed, 53 insertions(+), 24 deletions(-) diff --git a/apis/ops/v1alpha1/elasticsearch_ops_helpers.go b/apis/ops/v1alpha1/elasticsearch_ops_helpers.go index 4ba0a80ad6..a1859b63f7 100644 --- a/apis/ops/v1alpha1/elasticsearch_ops_helpers.go +++ b/apis/ops/v1alpha1/elasticsearch_ops_helpers.go @@ -67,6 +67,10 @@ func (e *ElasticsearchOpsRequest) GetDBRefName() string { return e.Spec.DatabaseRef.Name } +func (e *ElasticsearchOpsRequest) GetRequestType() any { + return e.Spec.Type +} + func (e *ElasticsearchOpsRequest) GetStatus() OpsRequestStatus { return e.Status } diff --git a/apis/ops/v1alpha1/etcd_ops_helpers.go b/apis/ops/v1alpha1/etcd_ops_helpers.go index 8459c4254c..0532b4ad64 100644 --- a/apis/ops/v1alpha1/etcd_ops_helpers.go +++ b/apis/ops/v1alpha1/etcd_ops_helpers.go @@ -67,6 +67,10 @@ func (e *EtcdOpsRequest) GetDBRefName() string { return e.Spec.DatabaseRef.Name } +func (e *EtcdOpsRequest) GetRequestType() any { + return e.Spec.Type +} + func (e *EtcdOpsRequest) GetStatus() OpsRequestStatus { return e.Status } diff --git a/apis/ops/v1alpha1/kafka_ops_helpers.go b/apis/ops/v1alpha1/kafka_ops_helpers.go index 890a365f03..1b4dfcff98 100644 --- a/apis/ops/v1alpha1/kafka_ops_helpers.go +++ b/apis/ops/v1alpha1/kafka_ops_helpers.go @@ -63,6 +63,10 @@ func (k *KafkaOpsRequest) GetDBRefName() string { return k.Spec.DatabaseRef.Name } +func (k *KafkaOpsRequest) GetRequestType() any { + return k.Spec.Type +} + func (k *KafkaOpsRequest) GetStatus() OpsRequestStatus { return k.Status } diff --git a/apis/ops/v1alpha1/mariadb_ops_helpers.go b/apis/ops/v1alpha1/mariadb_ops_helpers.go index eecdab47ec..67e6f9e140 100644 --- a/apis/ops/v1alpha1/mariadb_ops_helpers.go +++ b/apis/ops/v1alpha1/mariadb_ops_helpers.go @@ -88,6 +88,10 @@ func (m *MariaDBOpsRequest) GetDBRefName() string { return m.Spec.DatabaseRef.Name } +func (m *MariaDBOpsRequest) GetRequestType() any { + return m.Spec.Type +} + func (m *MariaDBOpsRequest) GetStatus() OpsRequestStatus { return m.Status } diff --git a/apis/ops/v1alpha1/memcached_ops_helpers.go b/apis/ops/v1alpha1/memcached_ops_helpers.go index 9aae7a4e7a..6da18b26e4 100644 --- a/apis/ops/v1alpha1/memcached_ops_helpers.go +++ b/apis/ops/v1alpha1/memcached_ops_helpers.go @@ -67,6 +67,10 @@ func (m *MemcachedOpsRequest) GetDBRefName() string { return m.Spec.DatabaseRef.Name } +func (m *MemcachedOpsRequest) GetRequestType() any { + return m.Spec.Type +} + func (m *MemcachedOpsRequest) GetStatus() OpsRequestStatus { return m.Status } diff --git a/apis/ops/v1alpha1/mongodb_ops_helpers.go b/apis/ops/v1alpha1/mongodb_ops_helpers.go index e9a056f73e..843875d430 100644 --- a/apis/ops/v1alpha1/mongodb_ops_helpers.go +++ b/apis/ops/v1alpha1/mongodb_ops_helpers.go @@ -67,6 +67,10 @@ func (m *MongoDBOpsRequest) GetDBRefName() string { return m.Spec.DatabaseRef.Name } +func (m *MongoDBOpsRequest) GetRequestType() any { + return m.Spec.Type +} + func (m *MongoDBOpsRequest) GetStatus() OpsRequestStatus { return m.Status } diff --git a/apis/ops/v1alpha1/mysql_ops_helpers.go b/apis/ops/v1alpha1/mysql_ops_helpers.go index cd93ddb91d..96df7fdd50 100644 --- a/apis/ops/v1alpha1/mysql_ops_helpers.go +++ b/apis/ops/v1alpha1/mysql_ops_helpers.go @@ -68,6 +68,10 @@ func (m *MySQLOpsRequest) GetDBRefName() string { return m.Spec.DatabaseRef.Name } +func (m *MySQLOpsRequest) GetRequestType() any { + return m.Spec.Type +} + func (m *MySQLOpsRequest) GetStatus() OpsRequestStatus { return m.Status } diff --git a/apis/ops/v1alpha1/perconaxtradb_ops_helpers.go b/apis/ops/v1alpha1/perconaxtradb_ops_helpers.go index ee3462a055..82467401ff 100644 --- a/apis/ops/v1alpha1/perconaxtradb_ops_helpers.go +++ b/apis/ops/v1alpha1/perconaxtradb_ops_helpers.go @@ -67,6 +67,10 @@ func (p *PerconaXtraDBOpsRequest) GetDBRefName() string { return p.Spec.DatabaseRef.Name } +func (p *PerconaXtraDBOpsRequest) GetRequestType() any { + return p.Spec.Type +} + func (p *PerconaXtraDBOpsRequest) GetStatus() OpsRequestStatus { return p.Status } diff --git a/apis/ops/v1alpha1/pgbouncer_ops_helpers.go b/apis/ops/v1alpha1/pgbouncer_ops_helpers.go index b01b786583..2f8d08a362 100644 --- a/apis/ops/v1alpha1/pgbouncer_ops_helpers.go +++ b/apis/ops/v1alpha1/pgbouncer_ops_helpers.go @@ -67,6 +67,10 @@ func (p *PgBouncerOpsRequest) GetDBRefName() string { return p.Spec.ServerRef.Name } +func (p *PgBouncerOpsRequest) GetRequestType() any { + return p.Spec.Type +} + func (p *PgBouncerOpsRequest) GetStatus() OpsRequestStatus { return p.Status } diff --git a/apis/ops/v1alpha1/postgres_ops_helpers.go b/apis/ops/v1alpha1/postgres_ops_helpers.go index dbbb1d761a..930727ed31 100644 --- a/apis/ops/v1alpha1/postgres_ops_helpers.go +++ b/apis/ops/v1alpha1/postgres_ops_helpers.go @@ -67,6 +67,10 @@ func (p *PostgresOpsRequest) GetDBRefName() string { return p.Spec.DatabaseRef.Name } +func (p *PostgresOpsRequest) GetRequestType() any { + return p.Spec.Type +} + func (p *PostgresOpsRequest) GetStatus() OpsRequestStatus { return p.Status } diff --git a/apis/ops/v1alpha1/proxysql_ops_helpers.go b/apis/ops/v1alpha1/proxysql_ops_helpers.go index c778c34293..1bf2a091e4 100644 --- a/apis/ops/v1alpha1/proxysql_ops_helpers.go +++ b/apis/ops/v1alpha1/proxysql_ops_helpers.go @@ -63,6 +63,10 @@ func (p *ProxySQLOpsRequest) GetDBRefName() string { return p.Spec.ProxyRef.Name } +func (p *ProxySQLOpsRequest) GetRequestType() any { + return p.Spec.Type +} + func (p *ProxySQLOpsRequest) GetStatus() OpsRequestStatus { return p.Status } diff --git a/apis/ops/v1alpha1/redis_ops_helpers.go b/apis/ops/v1alpha1/redis_ops_helpers.go index 19e24d11e0..b2c7183e62 100644 --- a/apis/ops/v1alpha1/redis_ops_helpers.go +++ b/apis/ops/v1alpha1/redis_ops_helpers.go @@ -67,6 +67,10 @@ func (r *RedisOpsRequest) GetDBRefName() string { return r.Spec.DatabaseRef.Name } +func (r *RedisOpsRequest) GetRequestType() any { + return r.Spec.Type +} + func (r *RedisOpsRequest) GetStatus() OpsRequestStatus { return r.Status } diff --git a/apis/ops/v1alpha1/redis_sentinel_ops_helpers.go b/apis/ops/v1alpha1/redis_sentinel_ops_helpers.go index d68a85b0c7..776c67b855 100644 --- a/apis/ops/v1alpha1/redis_sentinel_ops_helpers.go +++ b/apis/ops/v1alpha1/redis_sentinel_ops_helpers.go @@ -67,6 +67,10 @@ func (r *RedisSentinelOpsRequest) GetDBRefName() string { return r.Spec.DatabaseRef.Name } +func (r *RedisSentinelOpsRequest) GetRequestType() any { + return r.Spec.Type +} + func (r *RedisSentinelOpsRequest) GetStatus() OpsRequestStatus { return r.Status } diff --git a/apis/ops/v1alpha1/type.go b/apis/ops/v1alpha1/type.go index fa41c87625..7b5ebc5904 100644 --- a/apis/ops/v1alpha1/type.go +++ b/apis/ops/v1alpha1/type.go @@ -98,6 +98,7 @@ const ( type Accessor interface { GetObjectMeta() metav1.ObjectMeta GetDBRefName() string + GetRequestType() any GetStatus() OpsRequestStatus SetStatus(_ OpsRequestStatus) } diff --git a/openapi/swagger.json b/openapi/swagger.json index f4c5217dd0..db73af70eb 100644 --- a/openapi/swagger.json +++ b/openapi/swagger.json @@ -33403,10 +33403,6 @@ "description": "Specifies information necessary for upgrading Elasticsearch", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ElasticsearchUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading Elasticsearch Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ElasticsearchUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.ElasticsearchVerticalScalingSpec" @@ -33818,10 +33814,6 @@ "description": "Specifies information necessary for upgrading Memcached", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MemcachedUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading Memcached Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MemcachedUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MemcachedVerticalScalingSpec" @@ -34050,10 +34042,6 @@ "description": "Specifies information necessary for upgrading MongoDB", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MongoDBUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading MongoDB Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MongoDBUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MongoDBVerticalScalingSpec" @@ -34303,10 +34291,6 @@ "description": "Specifies information necessary for upgrading MySQL", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MySQLUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading MySQL Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MySQLUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.MySQLVerticalScalingSpec" @@ -34600,10 +34584,6 @@ "description": "Specifies information necessary for upgrading PerconaXtraDB", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PerconaXtraDBUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading PerconaXtraDB Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PerconaXtraDBUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PerconaXtraDBVerticalScalingSpec" @@ -34822,10 +34802,6 @@ "description": "Specifies information necessary for upgrading Postgres", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PostgresUpdateVersionSpec" }, - "upgrade": { - "description": "Specifies information necessary for upgrading Postgres Deprecated: use UpdateVersion", - "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PostgresUpdateVersionSpec" - }, "verticalScaling": { "description": "Specifies information necessary for vertical scaling", "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.PostgresVerticalScalingSpec"