Skip to content

Commit 729866d

Browse files
xocasdashdashxocasdashdash
committed
renamed from DefaultGrants to DefaultPrivileges
Signed-off-by: Joaquín Fernández Campo <[email protected]>
1 parent 7a06912 commit 729866d

File tree

13 files changed

+234
-261
lines changed

13 files changed

+234
-261
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Check the example:
6060
2. Create managed resources for your SQL server flavor:
6161

6262
- **MySQL**: `Database`, `Grant`, `User` (See [the examples](examples/mysql))
63-
- **PostgreSQL**: `Database`, `Grant`, `DefaultGrant`, `Extension`, `Role` (See [the examples](examples/postgresql))
63+
- **PostgreSQL**: `Database`, `Grant`, `DefaultPrivileges`, `Extension`, `Role` (See [the examples](examples/postgresql))
6464
- **MSSQL**: `Database`, `Grant`, `User` (See [the examples](examples/mssql))
6565

6666
[crossplane]: https://crossplane.io

‎apis/postgresql/v1alpha1/default_grant_types.go‎ renamed to ‎apis/postgresql/v1alpha1/default_privileges_types.go‎

Lines changed: 62 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
package v1alpha1
22

33
import (
4-
"context"
5-
64
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
7-
"github.com/crossplane/crossplane-runtime/pkg/reference"
8-
"github.com/pkg/errors"
95
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10-
"sigs.k8s.io/controller-runtime/pkg/client"
116
)
127

138
// +kubebuilder:object:root=true
@@ -18,31 +13,31 @@ import (
1813
// +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status"
1914
// +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
2015
// +kubebuilder:printcolumn:name="ROLE",type="string",JSONPath=".spec.forProvider.role"
21-
// +kubebuilder:printcolumn:name="MEMBER OF",type="string",JSONPath=".spec.forProvider.memberOf"
16+
// +kubebuilder:printcolumn:name="SCHEMA",type="string",JSONPath=".spec.forProvider.schema"
2217
// +kubebuilder:printcolumn:name="DATABASE",type="string",JSONPath=".spec.forProvider.database"
2318
// +kubebuilder:printcolumn:name="PRIVILEGES",type="string",JSONPath=".spec.forProvider.privileges"
2419
// +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,sql}
25-
type DefaultGrant struct {
20+
type DefaultPrivileges struct {
2621
metav1.TypeMeta `json:",inline"`
2722
metav1.ObjectMeta `json:"metadata,omitempty"`
2823

29-
Spec DefaultGrantSpec `json:"spec"`
30-
Status DefaultGrantStatus `json:"status,omitempty"`
24+
Spec DefaultPrivilegesSpec `json:"spec"`
25+
Status DefaultPrivilegesStatus `json:"status,omitempty"`
3126
}
3227

33-
// A DefaultGrantSpec defines the desired state of a Default Grant.
34-
type DefaultGrantSpec struct {
28+
// A DefaultPrivilegesSpec defines the desired state of a Default Grant.
29+
type DefaultPrivilegesSpec struct {
3530
xpv1.ResourceSpec `json:",inline"`
36-
ForProvider DefaultGrantParameters `json:"forProvider"`
31+
ForProvider DefaultPrivilegesParameters `json:"forProvider"`
3732
}
3833

39-
// A DefaultGrantStatus represents the observed state of a Grant.
40-
type DefaultGrantStatus struct {
34+
// A DefaultPrivilegesStatus represents the observed state of a Grant.
35+
type DefaultPrivilegesStatus struct {
4136
xpv1.ResourceStatus `json:",inline"`
4237
}
4338

44-
// DefaultGrantParameters defines the desired state of a Default Grant.
45-
type DefaultGrantParameters struct {
39+
// DefaultPrivilegesParameters defines the desired state of a Default Grant.
40+
type DefaultPrivilegesParameters struct {
4641
// Privileges to be granted.
4742
// See https://www.postgresql.org/docs/current/sql-grant.html for available privileges.
4843
// +optional
@@ -110,58 +105,58 @@ type DefaultGrantParameters struct {
110105

111106
// +kubebuilder:object:root=true
112107

113-
// DefaultGrantList contains a list of DefaultGrant.
114-
type DefaultGrantList struct {
108+
// DefaultPrivilegesList contains a list of DefaultPrivileges.
109+
type DefaultPrivilegesList struct {
115110
metav1.TypeMeta `json:",inline"`
116111
metav1.ListMeta `json:"metadata,omitempty"`
117-
Items []DefaultGrant `json:"items"`
112+
Items []DefaultPrivileges `json:"items"`
118113
}
119114

120-
// ResolveReferences of this DefaultGrant.
121-
func (mg *DefaultGrant) ResolveReferences(ctx context.Context, c client.Reader) error {
122-
r := reference.NewAPIResolver(c, mg)
123-
124-
// Resolve spec.forProvider.database
125-
rsp, err := r.Resolve(ctx, reference.ResolutionRequest{
126-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Database),
127-
Reference: mg.Spec.ForProvider.DatabaseRef,
128-
Selector: mg.Spec.ForProvider.DatabaseSelector,
129-
To: reference.To{Managed: &Database{}, List: &DatabaseList{}},
130-
Extract: reference.ExternalName(),
131-
})
132-
if err != nil {
133-
return errors.Wrap(err, "spec.forProvider.database")
134-
}
135-
mg.Spec.ForProvider.Database = reference.ToPtrValue(rsp.ResolvedValue)
136-
mg.Spec.ForProvider.DatabaseRef = rsp.ResolvedReference
137-
138-
// Resolve spec.forProvider.role
139-
rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
140-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Role),
141-
Reference: mg.Spec.ForProvider.RoleRef,
142-
Selector: mg.Spec.ForProvider.RoleSelector,
143-
To: reference.To{Managed: &Role{}, List: &RoleList{}},
144-
Extract: reference.ExternalName(),
145-
})
146-
if err != nil {
147-
return errors.Wrap(err, "spec.forProvider.role")
148-
}
149-
mg.Spec.ForProvider.Role = reference.ToPtrValue(rsp.ResolvedValue)
150-
mg.Spec.ForProvider.RoleRef = rsp.ResolvedReference
151-
152-
// Resolve spec.forProvider.schema
153-
rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
154-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Schema),
155-
Reference: mg.Spec.ForProvider.SchemaRef,
156-
Selector: mg.Spec.ForProvider.SchemaSelector,
157-
To: reference.To{Managed: &Role{}, List: &RoleList{}},
158-
Extract: reference.ExternalName(),
159-
})
160-
if err != nil {
161-
return errors.Wrap(err, "spec.forProvider.schema")
162-
}
163-
mg.Spec.ForProvider.Schema = reference.ToPtrValue(rsp.ResolvedValue)
164-
mg.Spec.ForProvider.SchemaRef = rsp.ResolvedReference
165-
166-
return nil
167-
}
115+
// ResolveReferences of this DefaultPrivileges.
116+
// func (mg *DefaultPrivileges) ResolveReferences(ctx context.Context, c client.Reader) error {
117+
// r := reference.NewAPIResolver(c, mg)
118+
119+
// // Resolve spec.forProvider.database
120+
// rsp, err := r.Resolve(ctx, reference.ResolutionRequest{
121+
// CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Database),
122+
// Reference: mg.Spec.ForProvider.DatabaseRef,
123+
// Selector: mg.Spec.ForProvider.DatabaseSelector,
124+
// To: reference.To{Managed: &Database{}, List: &DatabaseList{}},
125+
// Extract: reference.ExternalName(),
126+
// })
127+
// if err != nil {
128+
// return errors.Wrap(err, "spec.forProvider.database")
129+
// }
130+
// mg.Spec.ForProvider.Database = reference.ToPtrValue(rsp.ResolvedValue)
131+
// mg.Spec.ForProvider.DatabaseRef = rsp.ResolvedReference
132+
133+
// // Resolve spec.forProvider.role
134+
// rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
135+
// CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Role),
136+
// Reference: mg.Spec.ForProvider.RoleRef,
137+
// Selector: mg.Spec.ForProvider.RoleSelector,
138+
// To: reference.To{Managed: &Role{}, List: &RoleList{}},
139+
// Extract: reference.ExternalName(),
140+
// })
141+
// if err != nil {
142+
// return errors.Wrap(err, "spec.forProvider.role")
143+
// }
144+
// mg.Spec.ForProvider.Role = reference.ToPtrValue(rsp.ResolvedValue)
145+
// mg.Spec.ForProvider.RoleRef = rsp.ResolvedReference
146+
147+
// // Resolve spec.forProvider.schema
148+
// rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
149+
// CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Schema),
150+
// Reference: mg.Spec.ForProvider.SchemaRef,
151+
// Selector: mg.Spec.ForProvider.SchemaSelector,
152+
// To: reference.To{Managed: &Role{}, List: &RoleList{}},
153+
// Extract: reference.ExternalName(),
154+
// })
155+
// if err != nil {
156+
// return errors.Wrap(err, "spec.forProvider.schema")
157+
// }
158+
// mg.Spec.ForProvider.Schema = reference.ToPtrValue(rsp.ResolvedValue)
159+
// mg.Spec.ForProvider.SchemaRef = rsp.ResolvedReference
160+
161+
// return nil
162+
// }

‎apis/postgresql/v1alpha1/register.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ var (
9090
GrantGroupVersionKind = SchemeGroupVersion.WithKind(GrantKind)
9191
)
9292

93-
// DefaultGrant type metadata.
93+
// DefaultPrivileges type metadata.
9494
var (
95-
DefaultGrantKind = reflect.TypeOf(DefaultGrant{}).Name()
96-
DefaultGrantGroupKind = schema.GroupKind{Group: Group, Kind: DefaultGrantKind}.String()
97-
DefaultGrantKindAPIVersion = DefaultGrantKind + "." + SchemeGroupVersion.String()
98-
DefaultGrantGroupVersionKind = SchemeGroupVersion.WithKind(DefaultGrantKind)
95+
DefaultPrivilegesKind = reflect.TypeOf(DefaultPrivileges{}).Name()
96+
DefaultPrivilegesGroupKind = schema.GroupKind{Group: Group, Kind: DefaultPrivilegesKind}.String()
97+
DefaultPrivilegesKindAPIVersion = DefaultPrivilegesKind + "." + SchemeGroupVersion.String()
98+
DefaultPrivilegesGroupVersionKind = SchemeGroupVersion.WithKind(DefaultPrivilegesKind)
9999
)
100100

101101
// Schema type metadata.

‎apis/postgresql/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)