From eb1b7f2152cc769982b64821e1763bbc159f8ebd Mon Sep 17 00:00:00 2001 From: Arnob Kumar Saha Date: Mon, 24 Jul 2023 18:28:02 +0600 Subject: [PATCH] Change schema-manager constants type (#1051) Signed-off-by: Arnob Kumar Saha --- apis/schema/v1alpha1/constants.go | 108 +++++++++++++++--------------- apis/schema/v1alpha1/types.go | 5 -- go.mod | 2 +- go.sum | 4 +- vendor/modules.txt | 2 +- 5 files changed, 59 insertions(+), 62 deletions(-) diff --git a/apis/schema/v1alpha1/constants.go b/apis/schema/v1alpha1/constants.go index d293704767..85a747398e 100644 --- a/apis/schema/v1alpha1/constants.go +++ b/apis/schema/v1alpha1/constants.go @@ -16,6 +16,8 @@ limitations under the License. package v1alpha1 +import kmapi "kmodules.xyz/client-go/api/v1" + const ( DatabaseNameAdmin = "admin" DatabaseNameConfig = "config" @@ -41,59 +43,59 @@ const ( ) const ( - DatabaseSchemaConditionTypeDBServerReady DatabaseSchemaConditionType = "DatabaseServerReady" - DatabaseSchemaMessageDBServerNotCreated DatabaseSchemaMessage = "Database Server is not created yet" - DatabaseSchemaMessageDBServerProvisioning DatabaseSchemaMessage = "Database Server is provisioning" - DatabaseSchemaMessageDBServerReady DatabaseSchemaMessage = "Database Server is Ready" - - DatabaseSchemaConditionTypeVaultReady DatabaseSchemaConditionType = "VaultReady" - DatabaseSchemaMessageVaultNotCreated DatabaseSchemaMessage = "VaultServer is not created yet" - DatabaseSchemaMessageVaultProvisioning DatabaseSchemaMessage = "VaultServer is provisioning" - DatabaseSchemaMessageVaultReady DatabaseSchemaMessage = "VaultServer is Ready" - - DatabaseSchemaConditionTypeDoubleOptInNotPossible DatabaseSchemaConditionType = "DoubleOptInNotPossible" - DatabaseSchemaMessageDoubleOptInNotPossible DatabaseSchemaMessage = "Double OptIn is not possible between the applied Schema & Database server" - - DatabaseSchemaConditionTypeSecretEngineReady DatabaseSchemaConditionType = "SecretEngineReady" - DatabaseSchemaMessageSecretEngineNotCreated DatabaseSchemaMessage = "SecretEngine is not created yet" - DatabaseSchemaMessageSecretEngineCreating DatabaseSchemaMessage = "SecretEngine is being creating" - DatabaseSchemaMessageSecretEngineSuccess DatabaseSchemaMessage = "SecretEngine phase is success" - - DatabaseSchemaConditionTypeRoleReady DatabaseSchemaConditionType = "RoleReady" - DatabaseSchemaMessageDatabaseRoleNotCreated DatabaseSchemaMessage = "Database Role is not created yet" - DatabaseSchemaMessageDatabaseRoleCreating DatabaseSchemaMessage = "Database Role is being creating" - DatabaseSchemaMessageDatabaseRoleSuccess DatabaseSchemaMessage = "Database Role is success" - - DatabaseSchemaConditionTypeSecretAccessRequestReady DatabaseSchemaConditionType = "SecretAccessRequestReady" - DatabaseSchemaMessageSecretAccessRequestNotCreated DatabaseSchemaMessage = "SecretAccessRequest is not created yet" - DatabaseSchemaMessageSecretAccessRequestWaiting DatabaseSchemaMessage = "SecretAccessRequest is waiting for approval" - DatabaseSchemaMessageSecretAccessRequestApproved DatabaseSchemaMessage = "SecretAccessRequest has been approved" - DatabaseSchemaMessageSecretAccessRequestExpired DatabaseSchemaMessage = "SecretAccessRequest has been expired" - - DatabaseSchemaConditionTypeDBCreationUnsuccessful DatabaseSchemaConditionType = "DatabaseCreationUnsuccessful" - DatabaseSchemaMessageSchemaNameConflicted DatabaseSchemaMessage = "Schema name is conflicted" - DatabaseSchemaMessageDBCreationUnsuccessful DatabaseSchemaMessage = "Internal error occurred when creating database" - - DatabaseSchemaConditionTypeInitScriptCompleted DatabaseSchemaConditionType = "InitScriptCompleted" - DatabaseSchemaMessageInitScriptNotApplied DatabaseSchemaMessage = "InitScript is not applied yet" - DatabaseSchemaMessageInitScriptRunning DatabaseSchemaMessage = "InitScript is running" - DatabaseSchemaMessageInitScriptCompleted DatabaseSchemaMessage = "InitScript is completed" - DatabaseSchemaMessageInitScriptSucceeded DatabaseSchemaMessage = "InitScript is succeeded" - DatabaseSchemaMessageInitScriptFailed DatabaseSchemaMessage = "InitScript is failed" - - DatabaseSchemaConditionTypeRepositoryFound DatabaseSchemaConditionType = "RepositoryFound" - DatabaseSchemaMessageRepositoryNotCreated DatabaseSchemaMessage = "Repository is not created yet" - DatabaseSchemaMessageRepositoryFound DatabaseSchemaMessage = "Repository has been found" - - DatabaseSchemaConditionTypeAppBindingFound DatabaseSchemaConditionType = "AppBindingFound" - DatabaseSchemaMessageAppBindingNotCreated DatabaseSchemaMessage = "AppBinding is not created yet" - DatabaseSchemaMessageAppBindingFound DatabaseSchemaMessage = "AppBinding is Found" - - DatabaseSchemaConditionTypeRestoreCompleted DatabaseSchemaConditionType = "RestoreSessionCompleted" - DatabaseSchemaMessageRestoreSessionNotCreated DatabaseSchemaMessage = "RestoreSession is not created yet" - DatabaseSchemaMessageRestoreSessionRunning DatabaseSchemaMessage = "RestoreSession is running" - DatabaseSchemaMessageRestoreSessionSucceed DatabaseSchemaMessage = "RestoreSession is succeeded" - DatabaseSchemaMessageRestoreSessionFailed DatabaseSchemaMessage = "RestoreSession is failed" + DatabaseSchemaConditionTypeDBServerReady kmapi.ConditionType = "DatabaseServerReady" + DatabaseSchemaMessageDBServerNotCreated string = "Database Server is not created yet" + DatabaseSchemaMessageDBServerProvisioning string = "Database Server is provisioning" + DatabaseSchemaMessageDBServerReady string = "Database Server is Ready" + + DatabaseSchemaConditionTypeVaultReady kmapi.ConditionType = "VaultReady" + DatabaseSchemaMessageVaultNotCreated string = "VaultServer is not created yet" + DatabaseSchemaMessageVaultProvisioning string = "VaultServer is provisioning" + DatabaseSchemaMessageVaultReady string = "VaultServer is Ready" + + DatabaseSchemaConditionTypeDoubleOptInNotPossible kmapi.ConditionType = "DoubleOptInNotPossible" + DatabaseSchemaMessageDoubleOptInNotPossible string = "Double OptIn is not possible between the applied Schema & Database server" + + DatabaseSchemaConditionTypeSecretEngineReady kmapi.ConditionType = "SecretEngineReady" + DatabaseSchemaMessageSecretEngineNotCreated string = "SecretEngine is not created yet" + DatabaseSchemaMessageSecretEngineCreating string = "SecretEngine is being creating" + DatabaseSchemaMessageSecretEngineSuccess string = "SecretEngine phase is success" + + DatabaseSchemaConditionTypeRoleReady kmapi.ConditionType = "RoleReady" + DatabaseSchemaMessageDatabaseRoleNotCreated string = "Database Role is not created yet" + DatabaseSchemaMessageDatabaseRoleCreating string = "Database Role is being creating" + DatabaseSchemaMessageDatabaseRoleSuccess string = "Database Role is success" + + DatabaseSchemaConditionTypeSecretAccessRequestReady kmapi.ConditionType = "SecretAccessRequestReady" + DatabaseSchemaMessageSecretAccessRequestNotCreated string = "SecretAccessRequest is not created yet" + DatabaseSchemaMessageSecretAccessRequestWaiting string = "SecretAccessRequest is waiting for approval" + DatabaseSchemaMessageSecretAccessRequestApproved string = "SecretAccessRequest has been approved" + DatabaseSchemaMessageSecretAccessRequestExpired string = "SecretAccessRequest has been expired" + + DatabaseSchemaConditionTypeDBCreationUnsuccessful kmapi.ConditionType = "DatabaseCreationUnsuccessful" + DatabaseSchemaMessageSchemaNameConflicted string = "Schema name is conflicted" + DatabaseSchemaMessageDBCreationUnsuccessful string = "Internal error occurred when creating database" + + DatabaseSchemaConditionTypeInitScriptCompleted kmapi.ConditionType = "InitScriptCompleted" + DatabaseSchemaMessageInitScriptNotApplied string = "InitScript is not applied yet" + DatabaseSchemaMessageInitScriptRunning string = "InitScript is running" + DatabaseSchemaMessageInitScriptCompleted string = "InitScript is completed" + DatabaseSchemaMessageInitScriptSucceeded string = "InitScript is succeeded" + DatabaseSchemaMessageInitScriptFailed string = "InitScript is failed" + + DatabaseSchemaConditionTypeRepositoryFound kmapi.ConditionType = "RepositoryFound" + DatabaseSchemaMessageRepositoryNotCreated string = "Repository is not created yet" + DatabaseSchemaMessageRepositoryFound string = "Repository has been found" + + DatabaseSchemaConditionTypeAppBindingFound kmapi.ConditionType = "AppBindingFound" + DatabaseSchemaMessageAppBindingNotCreated string = "AppBinding is not created yet" + DatabaseSchemaMessageAppBindingFound string = "AppBinding is Found" + + DatabaseSchemaConditionTypeRestoreCompleted kmapi.ConditionType = "RestoreSessionCompleted" + DatabaseSchemaMessageRestoreSessionNotCreated string = "RestoreSession is not created yet" + DatabaseSchemaMessageRestoreSessionRunning string = "RestoreSession is running" + DatabaseSchemaMessageRestoreSessionSucceed string = "RestoreSession is succeeded" + DatabaseSchemaMessageRestoreSessionFailed string = "RestoreSession is failed" ) const ( diff --git a/apis/schema/v1alpha1/types.go b/apis/schema/v1alpha1/types.go index 31057b1611..50570f3251 100644 --- a/apis/schema/v1alpha1/types.go +++ b/apis/schema/v1alpha1/types.go @@ -83,8 +83,3 @@ type VaultSecretEngineRole struct { // +kubebuilder:validation:Enum=Pending;InProgress;Terminating;Current;Failed;Expired type DatabaseSchemaPhase string - -type ( - DatabaseSchemaConditionType string - DatabaseSchemaMessage string -) diff --git a/go.mod b/go.mod index d998bbd001..0b20d071d1 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( kubeops.dev/sidekick v0.0.2-0.20230113102427-9848f83b2f0f sigs.k8s.io/controller-runtime v0.13.1 sigs.k8s.io/yaml v1.3.0 - stash.appscode.dev/apimachinery v0.30.1-0.20230718090003-f65932b7df87 + stash.appscode.dev/apimachinery v0.30.1-0.20230722164128-56274c743ef0 ) require ( diff --git a/go.sum b/go.sum index 2b38861f70..af7586f85a 100644 --- a/go.sum +++ b/go.sum @@ -1415,5 +1415,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -stash.appscode.dev/apimachinery v0.30.1-0.20230718090003-f65932b7df87 h1:+4bErp0cItU06ODy3RfdnJqmUfwy2Bfo8Nd3Zs86q8g= -stash.appscode.dev/apimachinery v0.30.1-0.20230718090003-f65932b7df87/go.mod h1:Yx8VEJB+U3ibUWormB/1Nbx2Lo03Evoe7bURXDSOmsc= +stash.appscode.dev/apimachinery v0.30.1-0.20230722164128-56274c743ef0 h1:aaKNUiRo7KS/0TUz3UjE+s8q3d3WlFZ9RegtlEIAtog= +stash.appscode.dev/apimachinery v0.30.1-0.20230722164128-56274c743ef0/go.mod h1:dO0Qyd+8Fga7ba5rEXwaf7LgZIwB9qnKKfT6mvDs2Ug= diff --git a/vendor/modules.txt b/vendor/modules.txt index 8de690bf73..d8c54cc0ce 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1475,7 +1475,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# stash.appscode.dev/apimachinery v0.30.1-0.20230718090003-f65932b7df87 +# stash.appscode.dev/apimachinery v0.30.1-0.20230722164128-56274c743ef0 ## explicit; go 1.18 stash.appscode.dev/apimachinery/apis stash.appscode.dev/apimachinery/apis/repositories