diff --git a/pkg/kcp/provider/gcp/client/gcpConstants.go b/pkg/kcp/provider/gcp/client/gcpConstants.go index 8cd947e25..d464b92e3 100644 --- a/pkg/kcp/provider/gcp/client/gcpConstants.go +++ b/pkg/kcp/provider/gcp/client/gcpConstants.go @@ -2,10 +2,11 @@ package client import ( "fmt" - "github.com/kyma-project/cloud-manager/pkg/common/abstractions" "regexp" "time" + "github.com/kyma-project/cloud-manager/pkg/common/abstractions" + "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" ) @@ -143,6 +144,7 @@ const ( ComputeService GcpServiceName = "compute.googleapis.com" FilestoreService GcpServiceName = "file.googleapis.com" CloudResourceManagerService GcpServiceName = "cloudresourcemanager.googleapis.com" + MemoryStoreForRedisService GcpServiceName = "redis.googleapis.com" ) func GetCompleteServiceName(projectId string, serviceName GcpServiceName) string { diff --git a/pkg/kcp/scope/enableApisGcp.go b/pkg/kcp/scope/enableApisGcp.go index cc3de00d5..dacab28ed 100644 --- a/pkg/kcp/scope/enableApisGcp.go +++ b/pkg/kcp/scope/enableApisGcp.go @@ -3,11 +3,12 @@ package scope import ( "context" "fmt" + "os" + "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" gcpclient "github.com/kyma-project/cloud-manager/pkg/kcp/provider/gcp/client" "google.golang.org/api/serviceusage/v1" - "os" ) func enableApisGcp(ctx context.Context, st composed.State) (error, context.Context) { @@ -48,12 +49,19 @@ func enableApisGcp(ctx context.Context, st composed.State) (error, context.Conte if err != nil { return err, ctx } + // filestore err, _ = verifyAndAddOperationToStatus(ctx, scope, client, gcpclient.FilestoreService) if err != nil { return err, ctx } + // memorystore for redis + err, _ = verifyAndAddOperationToStatus(ctx, scope, client, gcpclient.MemoryStoreForRedisService) + if err != nil { + return err, ctx + } + if len(scope.Status.GcpOperations) == 0 { logger.Info("All APIs are enabled. Proceeding to next step.") return nil, nil