This repository has been archived by the owner on Oct 12, 2023. It is now read-only.
Replace AnyTypes with apiextensions.JSON #295
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
babbageclunk
requested review from
devigned,
matthchr,
Porges and
theunrepentantgeek
as code owners
Porges
reviewed
Oct 29, 2020
|
|
||
| # Exclusions for packages that currently produce types including AnyType. | ||
| # TODO: get rid of these, either by chasing the teams generating | ||
| # weird json or by handling them differently in the generator. | ||
| anyTypePackages: | ||
| - microsoft.authorization/v20180301 |
Porges
reviewed
Oct 29, 2020
| - action: exclude | ||
| group: microsoft.machinelearning | ||
| version: v20170101 | ||
| because: ExampleRequest.Inputs is a map[string][][]map[string]v1.JSON, which controller-gen doesn't know how to handle. |
Porges
approved these changes
Oct 29, 2020
|
This came out nicely! |
babbageclunk
force-pushed
the
json-fields
branch
from
008caa7 to
b38a2c9
Compare
theunrepentantgeek
approved these changes
Oct 29, 2020
| - action: exclude | ||
| group: microsoft.machinelearning | ||
| version: v20170101 | ||
| because: ExampleRequest.Inputs is a map[string][][]map[string]v1.JSON, which controller-gen doesn't know how to handle. |
| assignmentHandler(params.destination, newSource), | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Once my Test Cases branch is merged, we should loop back here and use some of the helper methods I've written to simplify the code.
babbageclunk
force-pushed
the
json-fields
branch
from
96a5297 to
6933103
Compare
Allowing arbitrary JSON in these fields makes sense since they're underconstrained in the ARM schemas. Updated the golden tests accordingly.
These are converted to map[string]JSON, because controller-gen has issues with maps of maps. kubernetes-sigs/controller-tools#287
microsoft.machinelearning/v20170101: ExampleRequest.Input comes out as a map[string][][]map[string]v1.JSON, which controller-gen can't handle. (Our ARM conversion code generation is also wrong for this, see https://github.com/Azure/k8s-infra/issues/289.) microsoft.web/v20150801: ARM conversion needs to add type casting to convert SitesSpecResourcesAppsettingsSpec.Name to SitesSpecResourcesAppsettingsSpecName in a number of places. Or possibly to just collapse the SitesSpecResourcesAppsettingsSpecName type back to a string? I'm not sure why that one stays a type alias when we change lots of other ones. microsoft.datafactory/v20180601: ExecuteSSISPackageActivityTypeProperties.PackageConnectionManagers is a map[string]map[string]SSISExecutionParameter
It's not needed now that the replaceAnyTypeWithJSON stage is in the pipeline. Keep the final check for AnyType though.
babbageclunk
force-pushed
the
json-fields
branch
from
df111c4 to
ad869ce
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a pipeline stage to convert AnyTypes to
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON, which can store arbitrary JSON values in the API. This enables generating all of the packages that were previously being filtered out because they generated interface{} fields.Removes the
filterOutDefinitionsUsingAnyTypestage, although leaves theensureDefinitionsDoNotUseAnyTypescheck at the end just in case later stages introduce AnyTypes again.A lot of packages include fields that come out as
map[string]map[string]v1.JSON(especially for UserAssignedIdentities fields), butcontroller-gencan't generate deep-copy code for these types. To handle these the stage collapses them down tomap[string]v1.JSONas well. kubernetes-sigs/controller-tools#287Adds special-case handling in the ARM conversion generation to ensure that JSON fields are deep-copied when converting to/from ARM types.
There are still a couple of packages that need to be excluded because the ARM conversion code generated for them has an issue or hits
controller-genlimitations.Fixes #133.