Skip to content

Commit e300487

Browse files
tydannynateinaction
authored andcommitted
use angryjet generation for resolvers
Signed-off-by: Ty Christensen <[email protected]>
1 parent 2c501fe commit e300487

File tree

58 files changed

+1557
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1557
-394
lines changed

apis/cluster/mysql/v1alpha1/grant_types.go

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"context"
21-
2220
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
"sigs.k8s.io/controller-runtime/pkg/client"
2421

2522
xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
26-
"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
27-
"github.com/crossplane/crossplane-runtime/v2/pkg/reference"
2823
)
2924

3025
// A GrantSpec defines the desired state of a Grant.
@@ -63,6 +58,7 @@ type GrantParameters struct {
6358

6459
// User this grant is for.
6560
// +optional
61+
// +crossplane:generate:reference:type=User
6662
User *string `json:"user,omitempty"`
6763

6864
// UserRef references the user object this grant is for.
@@ -81,6 +77,7 @@ type GrantParameters struct {
8177

8278
// Database this grant is for, default *.
8379
// +optional
80+
// +crossplane:generate:reference:type=Database
8481
Database *string `json:"database,omitempty" default:"*"`
8582

8683
// DatabaseRef references the database object this grant it for.
@@ -137,38 +134,3 @@ type GrantList struct {
137134
metav1.ListMeta `json:"metadata,omitempty"`
138135
Items []Grant `json:"items"`
139136
}
140-
141-
// ResolveReferences of this Grant
142-
func (mg *Grant) ResolveReferences(ctx context.Context, c client.Reader) error {
143-
r := reference.NewAPIResolver(c, mg)
144-
145-
// Resolve spec.forProvider.database
146-
rsp, err := r.Resolve(ctx, reference.ResolutionRequest{
147-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Database),
148-
Reference: mg.Spec.ForProvider.DatabaseRef,
149-
Selector: mg.Spec.ForProvider.DatabaseSelector,
150-
To: reference.To{Managed: &Database{}, List: &DatabaseList{}},
151-
Extract: reference.ExternalName(),
152-
})
153-
if err != nil {
154-
return errors.Wrap(err, "spec.forProvider.database")
155-
}
156-
mg.Spec.ForProvider.Database = reference.ToPtrValue(rsp.ResolvedValue)
157-
mg.Spec.ForProvider.DatabaseRef = rsp.ResolvedReference
158-
159-
// Resolve spec.forProvider.user
160-
rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
161-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.User),
162-
Reference: mg.Spec.ForProvider.UserRef,
163-
Selector: mg.Spec.ForProvider.UserSelector,
164-
To: reference.To{Managed: &User{}, List: &UserList{}},
165-
Extract: reference.ExternalName(),
166-
})
167-
if err != nil {
168-
return errors.Wrap(err, "spec.forProvider.user")
169-
}
170-
mg.Spec.ForProvider.User = reference.ToPtrValue(rsp.ResolvedValue)
171-
mg.Spec.ForProvider.UserRef = rsp.ResolvedReference
172-
173-
return nil
174-
}

apis/cluster/mysql/v1alpha1/zz_generated.resolvers.go

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

apis/cluster/postgresql/v1alpha1/extension_types.go

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"context"
21-
2220
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
client "sigs.k8s.io/controller-runtime/pkg/client"
2421

2522
xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
26-
reference "github.com/crossplane/crossplane-runtime/v2/pkg/reference"
27-
errors "github.com/pkg/errors"
2823
)
2924

3025
// ExtensionParameters are the configurable fields of a Extension.
@@ -43,6 +38,7 @@ type ExtensionParameters struct {
4338

4439
// Database for extension install.
4540
// +optional
41+
// +crossplane:generate:reference:type=Database
4642
Database *string `json:"database,omitempty"`
4743

4844
// DatabaseRef references the database object this extension is for.
@@ -94,23 +90,3 @@ type ExtensionList struct {
9490
metav1.ListMeta `json:"metadata,omitempty"`
9591
Items []Extension `json:"items"`
9692
}
97-
98-
// ResolveReferences of this Extension
99-
func (mg *Extension) ResolveReferences(ctx context.Context, c client.Reader) error {
100-
r := reference.NewAPIResolver(c, mg)
101-
102-
// Resolve spec.forProvider.database
103-
rsp, err := r.Resolve(ctx, reference.ResolutionRequest{
104-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Database),
105-
Reference: mg.Spec.ForProvider.DatabaseRef,
106-
Selector: mg.Spec.ForProvider.DatabaseSelector,
107-
To: reference.To{Managed: &Database{}, List: &DatabaseList{}},
108-
Extract: reference.ExternalName(),
109-
})
110-
if err != nil {
111-
return errors.Wrap(err, "spec.forProvider.database")
112-
}
113-
mg.Spec.ForProvider.Database = reference.ToPtrValue(rsp.ResolvedValue)
114-
mg.Spec.ForProvider.DatabaseRef = rsp.ResolvedReference
115-
return nil
116-
}

apis/cluster/postgresql/v1alpha1/grant_types.go

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"context"
21-
2220
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23-
client "sigs.k8s.io/controller-runtime/pkg/client"
2421

2522
xpv1 "github.com/crossplane/crossplane-runtime/v2/apis/common/v1"
26-
reference "github.com/crossplane/crossplane-runtime/v2/pkg/reference"
27-
errors "github.com/pkg/errors"
2823
)
2924

3025
// A GrantSpec defines the desired state of a Grant.
@@ -115,6 +110,7 @@ type GrantParameters struct {
115110

116111
// Role this grant is for.
117112
// +optional
113+
// +crossplane:generate:reference:type=Role
118114
Role *string `json:"role,omitempty"`
119115

120116
// RoleRef references the role object this grant is for.
@@ -129,6 +125,7 @@ type GrantParameters struct {
129125

130126
// Database this grant is for.
131127
// +optional
128+
// +crossplane:generate:reference:type=Database
132129
Database *string `json:"database,omitempty"`
133130

134131
// DatabaseRef references the database object this grant it for.
@@ -143,6 +140,7 @@ type GrantParameters struct {
143140

144141
// MemberOf is the Role that this grant makes Role a member of.
145142
// +optional
143+
// +crossplane:generate:reference:type=Role
146144
MemberOf *string `json:"memberOf,omitempty"`
147145

148146
// MemberOfRef references the Role that this grant makes Role a member of.
@@ -193,51 +191,3 @@ type GrantList struct {
193191
metav1.ListMeta `json:"metadata,omitempty"`
194192
Items []Grant `json:"items"`
195193
}
196-
197-
// ResolveReferences of this Grant
198-
func (mg *Grant) ResolveReferences(ctx context.Context, c client.Reader) error {
199-
r := reference.NewAPIResolver(c, mg)
200-
201-
// Resolve spec.forProvider.database
202-
rsp, err := r.Resolve(ctx, reference.ResolutionRequest{
203-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Database),
204-
Reference: mg.Spec.ForProvider.DatabaseRef,
205-
Selector: mg.Spec.ForProvider.DatabaseSelector,
206-
To: reference.To{Managed: &Database{}, List: &DatabaseList{}},
207-
Extract: reference.ExternalName(),
208-
})
209-
if err != nil {
210-
return errors.Wrap(err, "spec.forProvider.database")
211-
}
212-
mg.Spec.ForProvider.Database = reference.ToPtrValue(rsp.ResolvedValue)
213-
mg.Spec.ForProvider.DatabaseRef = rsp.ResolvedReference
214-
215-
// Resolve spec.forProvider.role
216-
rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
217-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Role),
218-
Reference: mg.Spec.ForProvider.RoleRef,
219-
Selector: mg.Spec.ForProvider.RoleSelector,
220-
To: reference.To{Managed: &Role{}, List: &RoleList{}},
221-
Extract: reference.ExternalName(),
222-
})
223-
if err != nil {
224-
return errors.Wrap(err, "spec.forProvider.role")
225-
}
226-
mg.Spec.ForProvider.Role = reference.ToPtrValue(rsp.ResolvedValue)
227-
mg.Spec.ForProvider.RoleRef = rsp.ResolvedReference
228-
229-
// Resolve spec.forProvider.memberOf
230-
rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
231-
CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.MemberOf),
232-
Reference: mg.Spec.ForProvider.MemberOfRef,
233-
Selector: mg.Spec.ForProvider.MemberOfSelector,
234-
To: reference.To{Managed: &Role{}, List: &RoleList{}},
235-
Extract: reference.ExternalName(),
236-
})
237-
if err != nil {
238-
return errors.Wrap(err, "spec.forProvider.memberOf")
239-
}
240-
mg.Spec.ForProvider.MemberOf = reference.ToPtrValue(rsp.ResolvedValue)
241-
mg.Spec.ForProvider.MemberOfRef = rsp.ResolvedReference
242-
return nil
243-
}

apis/cluster/postgresql/v1alpha1/zz_generated.resolvers.go

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

0 commit comments

Comments
 (0)