Merge pull request #649 from upbound/backport-648-to-release-0.32

[Backport release-0.32] Configure plural names for resources whose kind names end with "fleet"
crossplane-contrib · Apr 3, 2023 · d126588 · d126588
2 parents 5871b1e + 4252c8b
commit d126588
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 12 deletions.
diff --git a/apis/appstream/v1beta1/zz_fleet_types.go b/apis/appstream/v1beta1/zz_fleet_types.go
diff --git a/apis/gamelift/v1beta1/zz_fleet_types.go b/apis/gamelift/v1beta1/zz_fleet_types.go
diff --git a/apis/sagemaker/v1beta1/zz_devicefleet_types.go b/apis/sagemaker/v1beta1/zz_devicefleet_types.go
diff --git a/config/appstream/config.go b/config/appstream/config.go
@@ -17,6 +17,7 @@ func Configure(p *config.Provider) { // nolint:gocyclo
 			SelectorFieldName: "SubnetIDSelector",
 		}
 		r.UseAsync = true
+		r.Path = "fleet"
 	})
 	p.AddResourceConfigurator("aws_appstream_image_builder", func(r *config.Resource) {
 		r.References["vpc_config.subnet_ids"] = config.Reference{

diff --git a/config/gamelift/config.go b/config/gamelift/config.go
@@ -23,6 +23,7 @@ func Configure(p *config.Provider) {
 			Type: "Build",
 		}
 		r.UseAsync = true
+		r.Path = "fleet"
 	})
 
 	p.AddResourceConfigurator("aws_gamelift_game_server_group", func(r *config.Resource) {

diff --git a/config/sagemaker/config.go b/config/sagemaker/config.go
@@ -11,4 +11,7 @@ func Configure(p *config.Provider) {
 			IgnoredFields: []string{"source_ip_config"},
 		}
 	})
+	p.AddResourceConfigurator("aws_sagemaker_device_fleet", func(r *config.Resource) {
+		r.Path = "devicefleet"
+	})
 }
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
 	github.com/pkg/errors v0.9.1
-	github.com/upbound/upjet v0.9.0-rc.0.0.20230327151245-05c3d628e791
+	github.com/upbound/upjet v0.9.0-rc.0.0.20230403193742-b89baca4ae24
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.26.3

diff --git a/go.sum b/go.sum
@@ -555,8 +555,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ=
 github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/upbound/upjet v0.9.0-rc.0.0.20230327151245-05c3d628e791 h1:Y2+LQwPlfgRFbe3Yev6P+7aumifXRvGl+I3nryrU8qM=
-github.com/upbound/upjet v0.9.0-rc.0.0.20230327151245-05c3d628e791/go.mod h1:wwCuupQRfs+SL6LGAlAHu5Z/oPffvWaBQ9Luf+7CIZ8=
+github.com/upbound/upjet v0.9.0-rc.0.0.20230403193742-b89baca4ae24 h1:zWEi4gUi1kZ8e/rFsA2Q5ZLs1ABSgz1SjckecQjELDM=
+github.com/upbound/upjet v0.9.0-rc.0.0.20230403193742-b89baca4ae24/go.mod h1:wwCuupQRfs+SL6LGAlAHu5Z/oPffvWaBQ9Luf+7CIZ8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

diff --git a/...crds/appstream.aws.upbound.io_fleets.yaml → .../crds/appstream.aws.upbound.io_fleet.yaml b/...crds/appstream.aws.upbound.io_fleets.yaml → .../crds/appstream.aws.upbound.io_fleet.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
-  name: fleets.appstream.aws.upbound.io
+  name: fleet.appstream.aws.upbound.io
 spec:
   group: appstream.aws.upbound.io
   names:
@@ -15,7 +15,7 @@ spec:
     - aws
     kind: Fleet
     listKind: FleetList
-    plural: fleets
+    plural: fleet
     singular: fleet
   scope: Cluster
   versions:

diff --git a/.../crds/gamelift.aws.upbound.io_fleets.yaml → ...e/crds/gamelift.aws.upbound.io_fleet.yaml b/.../crds/gamelift.aws.upbound.io_fleets.yaml → ...e/crds/gamelift.aws.upbound.io_fleet.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
-  name: fleets.gamelift.aws.upbound.io
+  name: fleet.gamelift.aws.upbound.io
 spec:
   group: gamelift.aws.upbound.io
   names:
@@ -15,7 +15,7 @@ spec:
     - aws
     kind: Fleet
     listKind: FleetList
-    plural: fleets
+    plural: fleet
     singular: fleet
   scope: Cluster
   versions:

diff --git a/...agemaker.aws.upbound.io_devicefleets.yaml → ...sagemaker.aws.upbound.io_devicefleet.yaml b/...agemaker.aws.upbound.io_devicefleets.yaml → ...sagemaker.aws.upbound.io_devicefleet.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
-  name: devicefleets.sagemaker.aws.upbound.io
+  name: devicefleet.sagemaker.aws.upbound.io
 spec:
   group: sagemaker.aws.upbound.io
   names:
@@ -15,7 +15,7 @@ spec:
     - aws
     kind: DeviceFleet
     listKind: DeviceFleetList
-    plural: devicefleets
+    plural: devicefleet
     singular: devicefleet
   scope: Cluster
   versions: