move back to build flag edition specification (#1800)

This commit returns framework to setting the edition based on a build
flag. Due to v0.11.2 cherry-picking many commits, its picked up new
edition detection features that are missing ancillary commits. In
summary, setting an edition is entirely broken.

This reintroduces the edition build flag and still defaults builds to be
tkg, yet allows the TCE team to build a TCE version.

Signed-off-by: joshrosso <[email protected]>

apis/config/v1alpha1/clientconfig_types.go

@@ -110,6 +110,8 @@ type CLIOptions struct {
 	DiscoverySources []PluginDiscovery `json:"discoverySources,omitempty" yaml:"discoverySources"`
 	// UnstableVersionSelector determined which version tags are allowed
 	UnstableVersionSelector VersionSelectorLevel `json:"unstableVersionSelector,omitempty" yaml:"unstableVersionSelector"`
+	// Edition determines which editions plugins are running as
+	Edition string `json:"edition,omitempty" yaml:"edition"`
 }
 
 // PluginDiscovery contains a specific distribution mechanism. Only one of the

common.mk

@@ -35,6 +35,7 @@ BUILD_EDITION = tkg
 endif
 
 LD_FLAGS = -s -w
+LD_FLAGS += -X 'github.com/vmware-tanzu/tanzu-framework/pkg/v1/buildinfo.Edition=$(BUILD_EDITION)'
 LD_FLAGS += -X 'github.com/vmware-tanzu/tanzu-framework/pkg/v1/buildinfo.Date=$(BUILD_DATE)'
 LD_FLAGS += -X 'github.com/vmware-tanzu/tanzu-framework/pkg/v1/buildinfo.SHA=$(BUILD_SHA)'
 LD_FLAGS += -X 'github.com/vmware-tanzu/tanzu-framework/pkg/v1/buildinfo.Version=$(BUILD_VERSION)'

pkg/v1/buildinfo/buildvar.go

@@ -19,4 +19,8 @@ var (
 	// Version is the version the binary was built with.
 	// Set by go build -ldflags "-X" flag
 	Version string
+
+	// Edition is the edition the binary was built for.
+	// Set by go build -ldflags "-X" flag
+	Edition string
 )

pkg/v1/config/clientconfig.go

@@ -15,6 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 
 	configv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/config/v1alpha1"
+	"github.com/vmware-tanzu/tanzu-framework/pkg/v1/buildinfo"
 	"github.com/vmware-tanzu/tanzu-framework/pkg/v1/cli/common"
 )
 
@@ -147,6 +148,7 @@ func NewClientConfig() (*configv1alpha1.ClientConfig, error) {
 			CLI: &configv1alpha1.CLIOptions{
 				Repositories:            DefaultRepositories,
 				UnstableVersionSelector: DefaultVersionSelector,
+				Edition:                 buildinfo.Edition,
 			},
 		},
 	}
@@ -180,6 +182,10 @@ func addFeatureFlag(c *configv1alpha1.ClientConfig, plugin, flag string, flagVal
 	if c.ClientOptions == nil {
 		c.ClientOptions = &configv1alpha1.ClientOptions{}
 	}
+	// if edition is not set, set it to what was specified at build time
+	if c.ClientOptions.CLI.Edition == "" {
+		c.ClientOptions.CLI.Edition = buildinfo.Edition
+	}
 	if c.ClientOptions.Features == nil {
 		c.ClientOptions.Features = make(map[string]configv1alpha1.FeatureMap)
 	}

pkg/v1/providers/client/manifest/providers_embeded.go

@@ -1,6 +1,7 @@
 // Copyright 2021 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build embedproviders
 // +build embedproviders
 
 // Package manifest...

pkg/v1/providers/client/manifest/providers_skipped.go

@@ -1,6 +1,7 @@
 // Copyright 2021 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build !embedproviders
 // +build !embedproviders
 
 // Package manifest ...

pkg/v1/sdk/capabilities/controllers/suite_test.go

@@ -1,3 +1,4 @@
+//go:build envtest
 // +build envtest
 
 // Copyright 2021 VMware, Inc. All Rights Reserved.

pkg/v1/sdk/features/controllers/suite_test.go

@@ -1,3 +1,4 @@
+//go:build envtest
 // +build envtest
 
 // Copyright 2021 VMware, Inc. All Rights Reserved.

pkg/v1/tkg/aws/ini/fuzz.go

@@ -1,6 +1,7 @@
 // Copyright 2021 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build gofuzz
 // +build gofuzz
 
 package ini