Remove build tag (#339)

Azure · Nov 24, 2020 · 1c684b6 · 1c684b6
1 parent a540491
commit 1c684b6
Show file tree

Hide file tree

Showing 39 changed files with 6 additions and 60 deletions.
diff --git a/hack/generator/pkg/astmodel/file_definition.go b/hack/generator/pkg/astmodel/file_definition.go
@@ -251,13 +251,11 @@ func (file *FileDefinition) AsAst() *ast.File {
 			})
 	}
 
-	var comments []string
-	comments = append(comments, CodeGenerationComments...)
-	comments = append(comments,
-		"Copyright (c) Microsoft Corporation.",
-		"Licensed under the MIT license.")
-
-	header := createComments(comments...)
+	var header []string
+	header = append(header, CodeGenerationComments...)
+	header = append(header,
+		"// Copyright (c) Microsoft Corporation.",
+		"// Licensed under the MIT license.")
 
 	packageName := file.packageReference.PackageName()
 
@@ -275,18 +273,6 @@ func (file *FileDefinition) AsAst() *ast.File {
 	return result
 }
 
-// createComments converts a series of strings into a series of comments,
-// returning both the comments and their text length
-func createComments(lines ...string) ast.Decorations {
-	var result ast.Decorations
-	for _, l := range lines {
-		line := "// " + l + "\n"
-		result = append(result, line)
-	}
-
-	return result
-}
-
 // SaveToWriter writes the file to the specifier io.Writer
 func (file FileDefinition) SaveToWriter(filename string, dst io.Writer) error {
 	original := file.AsAst()

diff --git a/hack/generator/pkg/astmodel/generation_consts.go b/hack/generator/pkg/astmodel/generation_consts.go
@@ -7,11 +7,8 @@ package astmodel
 
 var (
 	CodeGenerationComments []string = []string{
-		// Compiler-readable comment, must be first in file:
-		"+build !ignore_autogenerated",
-
 		// Note that this format is actually an official specification in go:  https://github.com/golang/go/issues/13560
-		"Code generated by k8s-infra. DO NOT EDIT.", // TODO: Update this when the generated is moved/renamed
+		"// Code generated by k8s-infra. DO NOT EDIT.", // TODO: Update this when the generated is moved/renamed
 	}
 )
 

diff --git a/.../pkg/codegen/testdata/AdditionalProperties/Generates_field_if_other_fields_present.golden b/.../pkg/codegen/testdata/AdditionalProperties/Generates_field_if_other_fields_present.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...alProperties/Generates_map[string]interface{}_if_unset_and_no_other_fields_present.golden b/...alProperties/Generates_map[string]interface{}_if_unset_and_no_other_fields_present.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...odegen/testdata/AdditionalProperties/Generates_map_type_if_no_other_fields_present.golden b/...odegen/testdata/AdditionalProperties/Generates_map_type_if_no_other_fields_present.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...ator/pkg/codegen/testdata/AdditionalProperties/Generates_nothing_if_set_to_'false'.golden b/...ator/pkg/codegen/testdata/AdditionalProperties/Generates_nothing_if_set_to_'false'.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/.../testdata/AdditionalProperties/Generates_nothing_if_unset_and_other_fields_present.golden b/.../testdata/AdditionalProperties/Generates_nothing_if_unset_and_other_fields_present.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/AllOf/AllOf_collapses_duplicate_named_types.golden b/hack/generator/pkg/codegen/testdata/AllOf/AllOf_collapses_duplicate_named_types.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/AllOf/AllOf_collapses_duplicate_unnamed_types.golden b/hack/generator/pkg/codegen/testdata/AllOf/AllOf_collapses_duplicate_unnamed_types.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/AllOf/AllOf_generates_wrapper_type.golden b/hack/generator/pkg/codegen/testdata/AllOf/AllOf_generates_wrapper_type.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/AllOf/AllOf_handles_properties_on_owning_node.golden b/hack/generator/pkg/codegen/testdata/AllOf/AllOf_handles_properties_on_owning_node.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/AllOf/AllOf_ignores_description_only_schema.golden b/hack/generator/pkg/codegen/testdata/AllOf/AllOf_ignores_description_only_schema.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...tor/pkg/codegen/testdata/AllOf/AllOf_turns_map_type_back_into_additionalProperties.golden b/...tor/pkg/codegen/testdata/AllOf/AllOf_turns_map_type_back_into_additionalProperties.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden b/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden b/...nerator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...rator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden b/...rator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden b/...generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden b/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/Enum/Boolean_enum.golden b/hack/generator/pkg/codegen/testdata/Enum/Boolean_enum.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/Enum/Boolean_enum_value_with_quotes.golden b/hack/generator/pkg/codegen/testdata/Enum/Boolean_enum_value_with_quotes.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/Enum/Enum_with_star_value.golden b/hack/generator/pkg/codegen/testdata/Enum/Enum_with_star_value.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden b/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/EnumNames/Single_valued_enum_name.golden b/hack/generator/pkg/codegen/testdata/EnumNames/Single_valued_enum_name.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/OneOf/OneOf_collapses_duplicate_named_types.golden b/hack/generator/pkg/codegen/testdata/OneOf/OneOf_collapses_duplicate_named_types.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/OneOf/OneOf_collapses_duplicate_unnamed_types.golden b/hack/generator/pkg/codegen/testdata/OneOf/OneOf_collapses_duplicate_unnamed_types.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/.../generator/pkg/codegen/testdata/OneOf/OneOf_generates_wrapper_for_inner_properties.golden b/.../generator/pkg/codegen/testdata/OneOf/OneOf_generates_wrapper_for_inner_properties.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...erator/pkg/codegen/testdata/OneOf/OneOf_generates_wrapper_type_with_marshal_helper.golden b/...erator/pkg/codegen/testdata/OneOf/OneOf_generates_wrapper_type_with_marshal_helper.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...data/OneOf/OneOf_generates_wrapper_type_with_named_properties_from_anonymous_types.golden b/...data/OneOf/OneOf_generates_wrapper_type_with_named_properties_from_anonymous_types.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/OneOf/OneOf_handles_properties_on_owning_node.golden b/hack/generator/pkg/codegen/testdata/OneOf/OneOf_handles_properties_on_owning_node.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/OneOf/OneOf_preserves_names.golden b/hack/generator/pkg/codegen/testdata/OneOf/OneOf_preserves_names.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...degen/testdata/RemoveTypeAliasesPipeline/RemoveTypeAliases_all_aliases_are_inlined.golden b/...degen/testdata/RemoveTypeAliasesPipeline/RemoveTypeAliases_all_aliases_are_inlined.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...kg/codegen/testdata/RemoveTypeAliasesPipeline/RemoveTypeAliases_removes_type_alias.golden b/...kg/codegen/testdata/RemoveTypeAliasesPipeline/RemoveTypeAliases_removes_type_alias.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...odegen/testdata/UnreferencedDefinitions/unreferenced_definitions_are_not_generated.golden b/...odegen/testdata/UnreferencedDefinitions/unreferenced_definitions_are_not_generated.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/Validations/Enums_have_required_validation.golden b/hack/generator/pkg/codegen/testdata/Validations/Enums_have_required_validation.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/hack/generator/pkg/codegen/testdata/Validations/Optional_properties_are_pointers.golden b/hack/generator/pkg/codegen/testdata/Validations/Optional_properties_are_pointers.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...r/pkg/codegen/testdata/Validations/Optional_unknown_type_is_generated_as_interface.golden b/...r/pkg/codegen/testdata/Validations/Optional_unknown_type_is_generated_as_interface.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

diff --git a/...ator/pkg/codegen/testdata/Validations/Required_properties_have_appropriate_comment.golden b/...ator/pkg/codegen/testdata/Validations/Required_properties_have_appropriate_comment.golden
@@ -1,4 +1,3 @@
-// +build !ignore_autogenerated
 // Code generated by k8s-infra. DO NOT EDIT.
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.