Make authConfig as plain asset. Make infraenv as an asset

Author: pawanpinjarkar

pkg/asset/agent/common/infraenv.go

@@ -0,0 +1,30 @@
+package common
+
+import (
+	"github.com/google/uuid"
+
+	"github.com/openshift/installer/pkg/asset"
+)
+
+// InfraEnvID is an asset that generates infraEnvID.
+type InfraEnvID struct {
+	ID string
+}
+
+var _ asset.Asset = (*InfraEnvID)(nil)
+
+// Dependencies returns the assets on which the InfraEnv asset depends.
+func (a *InfraEnvID) Dependencies() []asset.Asset {
+	return []asset.Asset{}
+}
+
+// Generate generates the InfraEnvID for agent installer.
+func (a *InfraEnvID) Generate(dependencies asset.Parents) error {
+	a.ID = uuid.New().String()
+	return nil
+}
+
+// Name returns the human-friendly name of the asset.
+func (a *InfraEnvID) Name() string {
+	return "Agent Installer InfraEnv ID"
+}

pkg/asset/agent/common/utility.go

@@ -27,23 +27,27 @@ const (
 	InfraEnvKey LocalJWTKeyType = "infra_env_id"
 )
 
-var _ asset.WritableAsset = (*AuthConfig)(nil)
+var _ asset.Asset = (*AuthConfig)(nil)
 
 // Dependencies returns the assets on which the AuthConfig asset depends.
 func (a *AuthConfig) Dependencies() []asset.Asset {
-	return []asset.Asset{}
+	return []asset.Asset{
+		&common.InfraEnvID{},
+	}
 }
 
 // Generate generates the auth config for agent installer APIs.
 func (a *AuthConfig) Generate(dependencies asset.Parents) error {
+	infraEnvID := &common.InfraEnvID{}
+	dependencies.Get(infraEnvID)
 	PublicKey, PrivateKey, err := keyPairPEM()
 	if err != nil {
 		return err
 	}
 	a.PublicKey = PublicKey
 	a.PrivateKey = PrivateKey
 
-	token, err := localJWTForKey(common.InfraEnvID, a.PrivateKey)
+	token, err := localJWTForKey(infraEnvID.ID, a.PrivateKey)
 	if err != nil {
 		return err
 	}
@@ -57,21 +61,6 @@ func (a *AuthConfig) Name() string {
 	return "Agent Installer API Auth Config"
 }
 
-// Load returns the auth config from disk.
-func (a *AuthConfig) Load(f asset.FileFetcher) (bool, error) {
-	// The AuthConfig will not be needed by another asset so load is noop.
-	// This is implemented because it is required by WritableAsset
-	return false, nil
-}
-
-// Files returns the files generated by the asset.
-func (a *AuthConfig) Files() []*asset.File {
-	// Return empty array because File will never be loaded.
-	return []*asset.File{}
-}
-
-// Referenced from assisted-service.
-// https://github.com/openshift/assisted-service/blob/d3c0122452c74ad208055b8b6ee412812431a83f/internal/gencrypto/keys.go#L13-L54
 func keyPairPEM() (string, string, error) {
 	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
 	if err != nil {
@@ -115,8 +104,6 @@ func keyPairPEM() (string, string, error) {
 	return pubKeyPEM.String(), privKeyPEM.String(), nil
 }
 
-// Referenced from assisted-service.
-// https://github.com/openshift/assisted-service/blob/d3c0122452c74ad208055b8b6ee412812431a83f/internal/gencrypto/token.go#L33-L50
 func localJWTForKey(id string, privateKkeyPem string) (string, error) {
 	priv, err := jwt.ParseECPrivateKeyFromPEM([]byte(privateKkeyPem))
 	if err != nil {

pkg/asset/agent/gencrypto/authconfig.go

@@ -100,6 +100,7 @@ func (a *Ignition) Dependencies() []asset.Asset {
 		&mirror.RegistriesConf{},
 		&mirror.CaBundle{},
 		&gencrypto.AuthConfig{},
+		&common.InfraEnvID{},
 	}
 }
 
@@ -113,7 +114,8 @@ func (a *Ignition) Generate(dependencies asset.Parents) error {
 	agentHostsAsset := &agentconfig.AgentHosts{}
 	extraManifests := &manifests.ExtraManifests{}
 	keyPairAsset := &gencrypto.AuthConfig{}
-	dependencies.Get(agentManifests, agentConfigAsset, agentHostsAsset, extraManifests, keyPairAsset, agentWorkflow, clusterInfo, addNodesConfig)
+	infraEnvAsset := &common.InfraEnvID{}
+	dependencies.Get(agentManifests, agentConfigAsset, agentHostsAsset, extraManifests, keyPairAsset, agentWorkflow, clusterInfo, addNodesConfig, infraEnvAsset)
 
 	pwd := &password.KubeadminPassword{}
 	dependencies.Get(pwd)
@@ -229,7 +231,7 @@ func (a *Ignition) Generate(dependencies asset.Parents) error {
 
 	releaseImageMirror := mirror.GetMirrorFromRelease(agentManifests.ClusterImageSet.Spec.ReleaseImage, registriesConfig)
 
-	infraEnvID := common.InfraEnvID
+	infraEnvID := infraEnvAsset.ID
 	logrus.Debug("Generated random infra-env id ", infraEnvID)
 
 	osImage, err := getOSImagesInfo(archName, openshiftVersion, streamGetter)

pkg/asset/agent/image/ignition.go

@@ -78,16 +78,18 @@ func (a *UnconfiguredIgnition) Dependencies() []asset.Asset {
 		&manifests.NMStateConfig{},
 		&mirror.RegistriesConf{},
 		&mirror.CaBundle{},
+		&common.InfraEnvID{},
 	}
 }
 
 // Generate generates the agent installer unconfigured ignition.
 func (a *UnconfiguredIgnition) Generate(dependencies asset.Parents) error {
 	infraEnvAsset := &manifests.InfraEnv{}
+	infraEnvIDAsset := &common.InfraEnvID{}
 	clusterImageSetAsset := &manifests.ClusterImageSet{}
 	pullSecretAsset := &manifests.AgentPullSecret{}
 	nmStateConfigs := &manifests.NMStateConfig{}
-	dependencies.Get(infraEnvAsset, clusterImageSetAsset, pullSecretAsset, nmStateConfigs)
+	dependencies.Get(infraEnvAsset, clusterImageSetAsset, pullSecretAsset, nmStateConfigs, infraEnvIDAsset)
 
 	infraEnv := infraEnvAsset.Config
 	clusterImageSet := clusterImageSetAsset.Config
@@ -122,7 +124,7 @@ func (a *UnconfiguredIgnition) Generate(dependencies asset.Parents) error {
 	registryCABundle := &mirror.CaBundle{}
 	dependencies.Get(registriesConfig, registryCABundle)
 
-	infraEnvID := common.InfraEnvID
+	infraEnvID := infraEnvIDAsset.ID
 	logrus.Debug("Generated random infra-env id ", infraEnvID)
 
 	openshiftVersion, err := version.Version()