hack: fix some bugs in code generation (#66)

- the code generator now insists that types MUST be defined in
  a file called types.go
- we also need to generate openapi
- wipe the generated code at the start of codegen, so
  we don't accidentally preserve old state

Signed-off-by: Nick Santos <[email protected]>

Author: nicks

Makefile

@@ -22,7 +22,7 @@ vet:
 	go vet ./...
 
 # Generate code
-generate: pkg/apis/core/v1alpha1/manifest_types.go hack/update-codegen.sh
+generate: pkg/apis/core/v1alpha1/types.go hack/update-codegen.sh
 	hack/update-codegen.sh
 
 verify-generate:

hack/api_violations.list

@@ -0,0 +1,36 @@
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,Versions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroupList,Groups
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,Categories
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,ShortNames
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,Finalizers
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,ManagedFields
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,Rows
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Cells
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Conditions
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Type
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,MicroTime,Time
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,StatusCause,Type
+API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Time,Time
+API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentEncoding
+API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,ContentType

hack/update-codegen-helper.sh

@@ -25,17 +25,16 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 
 git config --global --add safe.directory /go/src/github.com/tilt-dev/tilt-apiserver
 
-# generate the code with:
-# --output-base    because this script should also be able to run inside the vendor dir of
-#                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
-#                  instead of the $GOPATH directly. For normal projects this can be dropped.
 source "${CODEGEN_PKG}/kube_codegen.sh"
 
+rm pkg/apis/**/zz_generated*
 kube::codegen::gen_helpers \
   --input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
   --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
 
+rm -fR pkg/generated
+mkdir -p pkg/generated
 kube::codegen::gen_client \
   --with-watch \
   --with-applyconfig \
@@ -44,3 +43,10 @@ kube::codegen::gen_client \
   --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
   --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
 
+kube::codegen::gen_openapi \
+  --input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
+  --output-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/generated \
+  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
+  --report-filename "${SCRIPT_ROOT}"/hack/api_violations.list \
+  --update-report \
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt