Skip to content

Commit e44de81

Browse files
pawelkucthde
authored andcommitted
feat: replace ObjectsBucket usage with Bucket
Remove unnecessary usage of ObjectsBucket types in the OpenSearch-related logic and tests. These references were only used in a few test scenarios and do not provide any benefit over the standard Bucket type.
1 parent 3adb67b commit e44de81

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

get/opensearch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ func (cmd *openSearchCmd) printSnapshotBucket(ctx context.Context, client *api.C
123123
return fmt.Errorf("no snapshot bucket configured for OpenSearch instance %s", openSearch.Name)
124124
}
125125

126-
bucket := &storage.ObjectsBucket{}
126+
bucket := &storage.Bucket{}
127127
if err := client.Get(ctx, types.NamespacedName{Name: bucketName, Namespace: client.Project}, bucket); err != nil {
128128
return err
129129
}
130130

131-
bucketURL := bucket.Status.AtProvider.URL
131+
bucketURL := bucket.Status.AtProvider.PublicURL
132132
if bucketURL == "" {
133133
return fmt.Errorf("no URL found in ObjectsBucket %s status", bucketName)
134134
}

get/opensearch_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,23 +203,23 @@ func TestOpenSearch(t *testing.T) {
203203
created.Status.AtProvider.SnapshotsBucket = meta.LocalReference{Name: instance.snapshotBucket}
204204

205205
// Add the ObjectsBucket resource to the fake client
206-
objectsBucket := &storage.ObjectsBucket{
206+
bucket := &storage.Bucket{
207207
ObjectMeta: metav1.ObjectMeta{
208208
Name: instance.snapshotBucket,
209209
Namespace: instance.project,
210210
},
211-
Spec: storage.ObjectsBucketSpec{
212-
ForProvider: storage.ObjectsBucketParameters{
211+
Spec: storage.BucketSpec{
212+
ForProvider: storage.BucketParameters{
213213
Location: meta.LocationNineCZ42,
214214
},
215215
},
216-
Status: storage.ObjectsBucketStatus{
217-
AtProvider: storage.ObjectsBucketObservation{
218-
URL: strings.TrimSpace(fmt.Sprintf("https://%s.objects.nineapis.ch/%s", meta.LocationNineES34, instance.snapshotBucket)),
216+
Status: storage.BucketStatus{
217+
AtProvider: storage.BucketObservation{
218+
PublicURL: strings.TrimSpace(fmt.Sprintf("https://%s.objects.nineapis.ch/%s", meta.LocationNineES34, instance.snapshotBucket)),
219219
},
220220
},
221221
}
222-
objects = append(objects, objectsBucket)
222+
objects = append(objects, bucket)
223223
}
224224

225225
objects = append(objects, created, &corev1.Secret{

0 commit comments

Comments
 (0)