Skip to content

regen with codegen v0.15.1 #120

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
merged 2 commits into from
Oct 18, 2021
Merged

regen with codegen v0.15.1 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7604547
regen with v0.15.1
ryansteakley Oct 8, 2021
07412ae
resourceGK has been renamed to GroupKind, change in all hooks.go files
ryansteakley Oct 8, 2021
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 CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ any 'help wanted' issues is a great place to start.

[See the documentation][dev-docs] for detailed development information.

[dev-docs]: https://aws-controllers-k8s.github.io/community/dev-docs/overview/
[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/

## Code of Conduct

Expand Down
12 changes: 6 additions & 6 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2021-09-13T20:22:07Z"
build_hash: c6e8ce29423336f827d2ca5c737595561c84539c
go_version: go1.16.4
version: v0.13.2
api_directory_checksum: 24add693149f092555aa338064f0129184c281d1
build_date: "2021-10-08T20:19:54Z"
build_hash: 1eaee0ea592ad5752cb9d403e2c13e9a7bdb8d33
go_version: go1.17.1
version: v0.15.1
api_directory_checksum: e768091ac8c8e31bb92321a47724cb9ffb5b0ee3
api_version: v1alpha1
aws_sdk_go_version: v1.38.11
generator_config_info:
file_checksum: b665c78d02f4ede0a1add8215f949f95c80621da
file_checksum: 8c59f7c55e4d6a9b98b623a0736a37c7a22e4882
original_file_name: generator.yaml
last_modification:
reason: API generation
14 changes: 5 additions & 9 deletions apis/v1alpha1/generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,9 @@ operations:
RetainAllVariantProperties: true
DescribeModelPackage:
custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod
primary_identifier_field_name: ARN
StopHyperParameterTuningJob:
operation_type: Delete
resource_name: HyperParameterTuningJob
DescribeModelQualityJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeModelBiasJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeDataQualityJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeModelExplainabilityJobDefinition:
primary_identifier_field_name: JobDefinitionName
resources:
Model:
hooks:
Expand Down Expand Up @@ -363,6 +354,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -382,6 +374,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -401,6 +394,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -420,6 +414,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand Down Expand Up @@ -484,6 +479,7 @@ resources:
is_ignored: true
ModelPackage:
update_conditions_custom_method_name: CustomUpdateConditions
is_arn_primary_key: true
exceptions:
errors:
404:
Expand Down
1 change: 1 addition & 0 deletions apis/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.

5 changes: 2 additions & 3 deletions config/controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ spec:
- command:
- ./bin/controller
args:
- --aws-account-id
- "$(AWS_ACCOUNT_ID)"
- --aws-region
- "$(AWS_REGION)"
- --enable-development-logging
Expand All @@ -41,7 +39,8 @@ spec:
image: controller:latest
name: controller
ports:
- containerPort: 8080
- name: http
containerPort: 8080
resources:
limits:
cpu: 100m
Expand Down
4 changes: 2 additions & 2 deletions config/controller/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spec:
ports:
- name: metricsport
port: 8080
targetPort: 8080
targetPort: http
protocol: TCP
type: NodePort
type: NodePort
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: dataqualityjobdefinitions.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_endpointconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: endpointconfigs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_endpoints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: endpoints.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_featuregroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: featuregroups.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_hyperparametertuningjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: hyperparametertuningjobs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_modelbiasjobdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: modelbiasjobdefinitions.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_modelexplainabilityjobdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: modelexplainabilityjobdefinitions.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_modelpackagegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: modelpackagegroups.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_modelpackages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: modelpackages.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_modelqualityjobdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: modelqualityjobdefinitions.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_models.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: models.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_monitoringschedules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: monitoringschedules.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_notebookinstancelifecycleconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: notebookinstancelifecycleconfigs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_notebookinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: notebookinstances.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_processingjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: processingjobs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_trainingjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: trainingjobs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: transformjobs.sagemaker.services.k8s.aws
spec:
Expand Down
14 changes: 5 additions & 9 deletions generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,9 @@ operations:
RetainAllVariantProperties: true
DescribeModelPackage:
custom_check_required_fields_missing_method: customCheckRequiredFieldsMissingMethod
primary_identifier_field_name: ARN
Copy link
Contributor

@surajkota surajkota Oct 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this override in the new format. can you elaborate on how it works? because I see that model_package is_identifier has not changed

Copy link
Member Author

@ryansteakley ryansteakley Oct 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Suraj, here it is for your reference aws-controllers-k8s/code-generator#190
The code it generates is the same but the way to enable it has changed. From setting primary_identifier_field_name: ARN to setting it as is_arn_primary_key: true

Copy link
Contributor

@surajkota surajkota Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sg, I missed the diff b/w is_primary_key: true to is_arn_primary_key: true

StopHyperParameterTuningJob:
operation_type: Delete
resource_name: HyperParameterTuningJob
DescribeModelQualityJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeModelBiasJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeDataQualityJobDefinition:
primary_identifier_field_name: JobDefinitionName
DescribeModelExplainabilityJobDefinition:
primary_identifier_field_name: JobDefinitionName
resources:
Model:
hooks:
Expand Down Expand Up @@ -363,6 +354,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -382,6 +374,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -401,6 +394,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand All @@ -420,6 +414,7 @@ resources:
is_arn: true
JobDefinitionName:
is_name: true
is_primary_key: true
Tags:
compare:
is_ignored: true
Expand Down Expand Up @@ -484,6 +479,7 @@ resources:
is_ignored: true
ModelPackage:
update_conditions_custom_method_name: CustomUpdateConditions
is_arn_primary_key: true
exceptions:
errors:
404:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/sagemaker-controller
go 1.14

require (
github.com/aws-controllers-k8s/runtime v0.13.2
github.com/aws-controllers-k8s/runtime v0.15.1
github.com/aws/aws-sdk-go v1.38.11
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.1.0
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/aws-controllers-k8s/runtime v0.13.2 h1:+gVwW4dTndPb4lB0WNLdHeiP7AGBOV+wBHGjpQUOh+w=
github.com/aws-controllers-k8s/runtime v0.13.2/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
github.com/aws-controllers-k8s/runtime v0.15.1 h1:3P+6MKWe8ITJynmoxmDnMPlkoI9nuVgn8XD9Pt/XHE8=
github.com/aws-controllers-k8s/runtime v0.15.1/go.mod h1:W0Txdhb1Npx5kg72w2WFwIpGFvSsMxXlJzzNHAwCLeY=
github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.38.11 h1:jmxKh557ZRc+Z8fALnGrL01Ctjks2aSUFLb7n/BZoEs=
github.com/aws/aws-sdk-go v1.38.11/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
Expand Down Expand Up @@ -177,6 +177,8 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWow=
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/sagemaker.services.k8s.aws_dataqualityjobdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: dataqualityjobdefinitions.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/sagemaker.services.k8s.aws_endpointconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: endpointconfigs.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/sagemaker.services.k8s.aws_endpoints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: endpoints.sagemaker.services.k8s.aws
spec:
Expand Down
2 changes: 1 addition & 1 deletion helm/crds/sagemaker.services.k8s.aws_featuregroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: featuregroups.sagemaker.services.k8s.aws
spec:
Expand Down
Loading