From 1ebac127ebba3dde55e4aeb9bee47cba753807c8 Mon Sep 17 00:00:00 2001 From: lsviben Date: Tue, 3 Oct 2023 14:10:19 +0200 Subject: [PATCH] GMP to beta Signed-off-by: lsviben --- pkg/migration/fake/mocks/mock.go | 26 ----------------------- pkg/pipeline/templates/controller.go.tmpl | 2 +- pkg/pipeline/templates/crd_types.go.tmpl | 5 ++--- pkg/terraform/files.go | 2 +- pkg/terraform/files_test.go | 2 +- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/pkg/migration/fake/mocks/mock.go b/pkg/migration/fake/mocks/mock.go index da753ea3..c572e085 100644 --- a/pkg/migration/fake/mocks/mock.go +++ b/pkg/migration/fake/mocks/mock.go @@ -304,20 +304,6 @@ func (mr *MockManagedMockRecorder) GetProviderConfigReference() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProviderConfigReference", reflect.TypeOf((*MockManaged)(nil).GetProviderConfigReference)) } -// GetProviderReference mocks base method. -func (m *MockManaged) GetProviderReference() *v1.Reference { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetProviderReference") - ret0, _ := ret[0].(*v1.Reference) - return ret0 -} - -// GetProviderReference indicates an expected call of GetProviderReference. -func (mr *MockManagedMockRecorder) GetProviderReference() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProviderReference", reflect.TypeOf((*MockManaged)(nil).GetProviderReference)) -} - // GetPublishConnectionDetailsTo mocks base method. func (m *MockManaged) GetPublishConnectionDetailsTo() *v1.PublishConnectionDetailsTo { m.ctrl.T.Helper() @@ -584,18 +570,6 @@ func (mr *MockManagedMockRecorder) SetProviderConfigReference(arg0 interface{}) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetProviderConfigReference", reflect.TypeOf((*MockManaged)(nil).SetProviderConfigReference), arg0) } -// SetProviderReference mocks base method. -func (m *MockManaged) SetProviderReference(arg0 *v1.Reference) { - m.ctrl.T.Helper() - m.ctrl.Call(m, "SetProviderReference", arg0) -} - -// SetProviderReference indicates an expected call of SetProviderReference. -func (mr *MockManagedMockRecorder) SetProviderReference(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetProviderReference", reflect.TypeOf((*MockManaged)(nil).SetProviderReference), arg0) -} - // SetPublishConnectionDetailsTo mocks base method. func (m *MockManaged) SetPublishConnectionDetailsTo(arg0 *v1.PublishConnectionDetailsTo) { m.ctrl.T.Helper() diff --git a/pkg/pipeline/templates/controller.go.tmpl b/pkg/pipeline/templates/controller.go.tmpl index 4dcb6d8f..94b39712 100644 --- a/pkg/pipeline/templates/controller.go.tmpl +++ b/pkg/pipeline/templates/controller.go.tmpl @@ -58,7 +58,7 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { opts = append(opts, managed.WithPollJitterHook(o.PollJitter)) } {{- if .FeaturesPackageAlias }} - if o.Features.Enabled({{ .FeaturesPackageAlias }}EnableAlphaManagementPolicies) { + if o.Features.Enabled({{ .FeaturesPackageAlias }}EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } {{- end}} diff --git a/pkg/pipeline/templates/crd_types.go.tmpl b/pkg/pipeline/templates/crd_types.go.tmpl index 6482343d..f9d309c9 100644 --- a/pkg/pipeline/templates/crd_types.go.tmpl +++ b/pkg/pipeline/templates/crd_types.go.tmpl @@ -17,9 +17,8 @@ import ( type {{ .CRD.Kind }}Spec struct { {{ .XPCommonAPIsPackageAlias }}ResourceSpec `json:",inline"` ForProvider {{ .CRD.ForProviderType }} `json:"forProvider"` - // THIS IS AN ALPHA FIELD. Do not use it in production. It is not honored - // unless the relevant Crossplane feature flag is enabled, and may be - // changed or removed without notice. + // THIS IS A BETA FIELD. It is not honored + // unless the relevant Crossplane feature flag is enabled. // InitProvider holds the same fields as ForProvider, with the exception // of Identifier and other resource reference fields. The fields that are // in InitProvider are merged into ForProvider when the resource is created. diff --git a/pkg/terraform/files.go b/pkg/terraform/files.go index 8a556755..912576ff 100644 --- a/pkg/terraform/files.go +++ b/pkg/terraform/files.go @@ -76,7 +76,7 @@ func NewFileProducer(ctx context.Context, client resource.SecretClient, dir stri // Note(lsviben):We need to check if the management policies feature is // enabled before attempting to get the ignorable fields or merge them // with the forProvider fields. - if fp.features.Enabled(feature.EnableAlphaManagementPolicies) { + if fp.features.Enabled(feature.EnableBetaManagementPolicies) { initParams, err := tr.GetInitParameters() if err != nil { return nil, errors.Wrapf(err, "cannot get the init parameters for the resource %q", tr.GetName()) diff --git a/pkg/terraform/files_test.go b/pkg/terraform/files_test.go index ec38af8e..60cbdeb6 100644 --- a/pkg/terraform/files_test.go +++ b/pkg/terraform/files_test.go @@ -459,7 +459,7 @@ func TestWriteMainTF(t *testing.T) { }, f: func() *feature.Flags { f := &feature.Flags{} - f.Enable(feature.EnableAlphaManagementPolicies) + f.Enable(feature.EnableBetaManagementPolicies) return f }(), },