Skip to content

Fix bucket behavior #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tchinmai7 merged 3 commits into from
Apr 28, 2025
Merged

Fix bucket behavior #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b3d15f
Buckets should be able to refer a cert
tchinmai7 Apr 25, 2025
2003bf9
Buckets should be able to refer a cert
tchinmai7 Apr 25, 2025
f4160cd
fix workflow ref
tchinmai7 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
e2e:
uses: upbound/uptest/.github/workflows/pr-comment-trigger.yml@main
uses: upbound/official-providers-ci/.github/workflows/pr-comment-trigger.yml@main
secrets:
UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }}
UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }}
2 changes: 1 addition & 1 deletion apis/objectstorage/v1alpha1/zz_bucket_terraformed.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 5 additions & 13 deletions apis/objectstorage/v1alpha1/zz_bucket_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 8 additions & 40 deletions apis/objectstorage/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions config/objectstoragebucket/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,13 @@ package objectstoragebucket

import (
"github.com/crossplane/upjet/pkg/config"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

// Configure configures individual resources by adding custom ResourceConfigurators.
func Configure(p *config.Provider) {
p.AddResourceConfigurator("linode_object_storage_bucket", func(r *config.Resource) {
r.ShortGroup = "objectstorage"
r.Kind = "Bucket"
element, ok := r.TerraformResource.Schema["cert"].Elem.(*schema.Resource)
if ok {
element.Schema["certificate"].Sensitive = false
element.Schema["private_key"].Sensitive = false
}

r.References["access_key"] = config.Reference{
Type: "Key",
RefFieldName: "AccessKeyRef",
Expand Down
111 changes: 99 additions & 12 deletions package/crds/objectstorage.linode.upbound.io_buckets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,44 @@ spec:
description: The cert used by this Object Storage Bucket.
items:
properties:
certificate:
certificateSecretRef:
description: |-
The Base64 encoded and PEM formatted SSL certificate.
The Base64 encoded and PEM formatted SSL certificate.
type: string
privateKey:
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
privateKeySecretRef:
description: |-
The private key associated with the TLS/SSL certificate.
The private key associated with the TLS/SSL certificate.
type: string
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
type: object
type: array
cluster:
Expand Down Expand Up @@ -389,16 +417,47 @@ spec:
description: The cert used by this Object Storage Bucket.
items:
properties:
certificate:
certificateSecretRef:
description: |-
The Base64 encoded and PEM formatted SSL certificate.
The Base64 encoded and PEM formatted SSL certificate.
type: string
privateKey:
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
privateKeySecretRef:
description: |-
The private key associated with the TLS/SSL certificate.
The private key associated with the TLS/SSL certificate.
type: string
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
required:
- certificateSecretRef
- privateKeySecretRef
type: object
type: array
cluster:
Expand Down Expand Up @@ -707,16 +766,44 @@ spec:
description: The cert used by this Object Storage Bucket.
items:
properties:
certificate:
certificateSecretRef:
description: |-
The Base64 encoded and PEM formatted SSL certificate.
The Base64 encoded and PEM formatted SSL certificate.
type: string
privateKey:
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
privateKeySecretRef:
description: |-
The private key associated with the TLS/SSL certificate.
The private key associated with the TLS/SSL certificate.
type: string
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
type: object
type: array
cluster:
Expand Down
Loading