Merge pull request openshift#8562 from shiftstack/context

OSASINFRA-3510: Change 'Generate' to accept a context

Author: openshift-merge-bot[bot]

pkg/asset/agent/agentconfig/agent_config.go

@@ -1,6 +1,7 @@
 package agentconfig
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -40,7 +41,7 @@ func (*AgentConfig) Dependencies() []asset.Asset {
 }
 
 // Generate generates the Agent Config manifest.
-func (a *AgentConfig) Generate(dependencies asset.Parents) error {
+func (a *AgentConfig) Generate(_ context.Context, dependencies asset.Parents) error {
 	// TODO: We are temporarily generating a template of the agent-config.yaml
 	// Change this when its interactive survey is implemented.
 	agentConfigTemplate := `#

pkg/asset/agent/agentconfig/agenthosts.go

@@ -1,6 +1,7 @@
 package agentconfig
 
 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -59,7 +60,7 @@ func (a *AgentHosts) Dependencies() []asset.Asset {
 }
 
 // Generate generates the Hosts data.
-func (a *AgentHosts) Generate(dependencies asset.Parents) error {
+func (a *AgentHosts) Generate(_ context.Context, dependencies asset.Parents) error {
 	agentWorkflow := &workflow.AgentWorkflow{}
 	addNodesConfig := &joiner.AddNodesConfig{}
 	agentConfig := &AgentConfig{}

pkg/asset/agent/agentconfig/agenthosts_test.go

@@ -1,6 +1,7 @@
 package agentconfig
 
 import (
+	"context"
 	"net"
 	"testing"
 
@@ -296,7 +297,7 @@ func TestAgentHosts_Generate(t *testing.T) {
 			parents.Add(tc.dependencies...)
 
 			asset := &AgentHosts{}
-			err := asset.Generate(parents)
+			err := asset.Generate(context.Background(), parents)
 
 			if tc.expectedError != "" {
 				assert.Equal(t, tc.expectedError, err.Error())

pkg/asset/agent/common/infraenv.go

@@ -1,6 +1,8 @@
 package common
 
 import (
+	"context"
+
 	"github.com/google/uuid"
 
 	"github.com/openshift/installer/pkg/asset"
@@ -19,7 +21,7 @@ func (a *InfraEnvID) Dependencies() []asset.Asset {
 }
 
 // Generate generates the InfraEnvID for agent installer.
-func (a *InfraEnvID) Generate(dependencies asset.Parents) error {
+func (a *InfraEnvID) Generate(_ context.Context, dependencies asset.Parents) error {
 	a.ID = uuid.New().String()
 	return nil
 }

pkg/asset/agent/configimage/configiso.go

@@ -1,6 +1,7 @@
 package configimage
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"strings"
@@ -35,7 +36,7 @@ func (a *ConfigImage) Dependencies() []asset.Asset {
 }
 
 // Generate generates the configuration image file.
-func (a *ConfigImage) Generate(dependencies asset.Parents) error {
+func (a *ConfigImage) Generate(_ context.Context, dependencies asset.Parents) error {
 	ignition := &image.Ignition{}
 
 	dependencies.Get(ignition)

pkg/asset/agent/gencrypto/authconfig.go

@@ -2,6 +2,7 @@ package gencrypto
 
 import (
 	"bytes"
+	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
 	"crypto/rand"
@@ -37,7 +38,7 @@ func (a *AuthConfig) Dependencies() []asset.Asset {
 }
 
 // Generate generates the auth config for agent installer APIs.
-func (a *AuthConfig) Generate(dependencies asset.Parents) error {
+func (a *AuthConfig) Generate(_ context.Context, dependencies asset.Parents) error {
 	infraEnvID := &common.InfraEnvID{}
 	dependencies.Get(infraEnvID)
 	PublicKey, PrivateKey, err := keyPairPEM()

pkg/asset/agent/gencrypto/authconfig_test.go

@@ -1,6 +1,7 @@
 package gencrypto
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -23,7 +24,7 @@ func TestAuthConfig_Generate(t *testing.T) {
 			parents.Add(&common.InfraEnvID{})
 
 			authConfigAsset := &AuthConfig{}
-			err := authConfigAsset.Generate(parents)
+			err := authConfigAsset.Generate(context.Background(), parents)
 
 			assert.NoError(t, err)
 

pkg/asset/agent/image/agentartifacts.go

@@ -1,6 +1,7 @@
 package image
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -48,7 +49,7 @@ func (a *AgentArtifacts) Dependencies() []asset.Asset {
 }
 
 // Generate generates the configurations for the agent ISO image and PXE assets.
-func (a *AgentArtifacts) Generate(dependencies asset.Parents) error {
+func (a *AgentArtifacts) Generate(_ context.Context, dependencies asset.Parents) error {
 	ignition := &Ignition{}
 	kargs := &Kargs{}
 	baseIso := &BaseIso{}

pkg/asset/agent/image/agentimage.go

@@ -1,6 +1,7 @@
 package image
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -52,7 +53,7 @@ func (a *AgentImage) Dependencies() []asset.Asset {
 }
 
 // Generate generates the image file for to ISO asset.
-func (a *AgentImage) Generate(dependencies asset.Parents) error {
+func (a *AgentImage) Generate(ctx context.Context, dependencies asset.Parents) error {
 	agentWorkflow := &workflow.AgentWorkflow{}
 	clusterInfo := &joiner.ClusterInfo{}
 	agentArtifacts := &AgentArtifacts{}
@@ -92,7 +93,7 @@ func (a *AgentImage) Generate(dependencies asset.Parents) error {
 			logrus.Debugf("Using custom rootfs URL: %s", a.rootFSURL)
 		} else {
 			// Default to the URL from the RHCOS streams file
-			defaultRootFSURL, err := baseIso.getRootFSURL(a.cpuArch)
+			defaultRootFSURL, err := baseIso.getRootFSURL(ctx, a.cpuArch)
 			if err != nil {
 				return err
 			}

pkg/asset/agent/image/agentpxefiles.go

@@ -2,6 +2,7 @@ package image
 
 import (
 	"compress/gzip"
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -41,7 +42,7 @@ func (a *AgentPXEFiles) Dependencies() []asset.Asset {
 }
 
 // Generate generates the image files for PXE asset.
-func (a *AgentPXEFiles) Generate(dependencies asset.Parents) error {
+func (a *AgentPXEFiles) Generate(_ context.Context, dependencies asset.Parents) error {
 	agentArtifacts := &AgentArtifacts{}
 	dependencies.Get(agentArtifacts)