Add "endpoint" and "endpointURL" fields to bucket status

vshn · Oct 24, 2022 · cc3a006 · cc3a006
1 parent daa008b
commit cc3a006
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/apis/cloudscale/v1/bucket_types.go b/apis/cloudscale/v1/bucket_types.go
@@ -36,10 +36,8 @@ type BucketParameters struct {
 
 	// +kubebuilder:validation:Required
 
-	// EndpointURL is the URL where to create the bucket.
-	// If the scheme is omitted (`http/s`), HTTPS is assumed.
-	// Changing the endpoint after initial creation might have no effect.
-	EndpointURL string `json:"endpointURL"`
+	// Deprecated: Only here for compatibility with legacy Bucket objects
+	EndpointURL string `json:"endpointURL,omitempty"`
 
 	// BucketName is the name of the bucket to create.
 	// Defaults to `metadata.name` if unset.
@@ -80,6 +78,8 @@ type BucketObservation struct {
 // BucketStatus represents the observed state of a Bucket.
 type BucketStatus struct {
 	xpv1.ResourceStatus `json:",inline"`
+	Endpoint            string            `json:"endpoint,omitempty"`
+	EndpointURL         string            `json:"endpointURL,omitempty"`
 	AtProvider          BucketObservation `json:"atProvider,omitempty"`
 }
 

diff --git a/operator/bucketcontroller/connector.go b/operator/bucketcontroller/connector.go
@@ -48,6 +48,8 @@ func (c *bucketConnector) Connect(ctx context.Context, mg resource.Managed) (man
 		return &NoopClient{}, nil
 	}
 
+	bucket.Status.Endpoint = fmt.Sprintf("objects.%s.cloudscale.ch", bucket.Spec.ForProvider.Region)
+	bucket.Status.EndpointURL = fmt.Sprintf("https://%s", bucket.Status.Endpoint)
 	pctx := &connectContext{Context: ctx, bucket: bucket}
 	pipe := pipeline.NewPipeline[*connectContext]()
 	pipe.WithBeforeHooks(pipelineutil.DebugLogger(pctx)).
@@ -103,7 +105,7 @@ func (c *bucketConnector) createS3Client(ctx *connectContext) error {
 	secret := ctx.credentialsSecret
 	bucket := ctx.bucket
 
-	parsed, err := url.Parse(bucket.Spec.ForProvider.EndpointURL)
+	parsed, err := url.Parse(bucket.Status.EndpointURL)
 	if err != nil {
 		return err
 	}

diff --git a/package/crds/cloudscale.crossplane.io_buckets.yaml b/package/crds/cloudscale.crossplane.io_buckets.yaml
@@ -106,9 +106,8 @@ spec:
                     type: object
                     x-kubernetes-map-type: atomic
                   endpointURL:
-                    description: EndpointURL is the URL where to create the bucket.
-                      If the scheme is omitted (`http/s`), HTTPS is assumed. Changing
-                      the endpoint after initial creation might have no effect.
+                    description: 'Deprecated: Only here for compatibility with legacy
+                      Bucket objects'
                     type: string
                   region:
                     description: Region is the name of the region where the bucket
@@ -117,7 +116,6 @@ spec:
                     type: string
                 required:
                 - credentialsSecretRef
-                - endpointURL
                 - region
                 type: object
               providerConfigRef:
@@ -334,6 +332,10 @@ spec:
                   - type
                   type: object
                 type: array
+              endpoint:
+                type: string
+              endpointURL:
+                type: string
             type: object
         required:
         - spec