Weave the proper context through k8s and machine environ apis

Author: wallyworld

agent/agentbootstrap/bootstrap.go

@@ -652,7 +652,7 @@ func (b *AgentBootstrap) initControllerCloudService(
 		// this should never happen.
 		return errors.Errorf("environ %T does not implement ServiceManager interface", env)
 	}
-	svc, err := broker.GetService(k8sconstants.JujuControllerStackName, true)
+	svc, err := broker.GetService(ctx, k8sconstants.JujuControllerStackName, true)
 	if err != nil {
 		return errors.Trace(err)
 	}

api/apiclient.go

@@ -639,7 +639,7 @@ func dialAPI(ctx context.Context, info *Info, opts0 DialOpts) (*dialResult, erro
 	addrs := info.Addrs[:]
 
 	if info.Proxier != nil {
-		if err := info.Proxier.Start(); err != nil {
+		if err := info.Proxier.Start(ctx); err != nil {
 			return nil, errors.Annotate(err, "starting proxy for api connection")
 		}
 		logger.Debugf("starting proxier for connection")

api/client/modelupgrader/upgrader.go

@@ -80,7 +80,7 @@ func (c *Client) UpgradeModel(
 }
 
 // UploadTools uploads tools at the specified location to the API server over HTTPS.
-func (c *Client) UploadTools(r io.ReadSeeker, vers version.Binary) (tools.List, error) {
+func (c *Client) UploadTools(_ context.Context, r io.ReadSeeker, vers version.Binary) (tools.List, error) {
 	req, err := http.NewRequest("POST", fmt.Sprintf("/tools?binaryVersion=%s", vers), r)
 	if err != nil {
 		return nil, errors.Annotate(err, "cannot create upload request")

api/client/modelupgrader/upgrader_test.go

@@ -115,6 +115,7 @@ func (s *UpgradeModelSuite) TestUploadTools(c *gc.C) {
 	client := modelupgrader.NewClient(apiCaller)
 
 	result, err := client.UploadTools(
+		context.Background(),
 		nil, version.MustParseBinary("2.9.100-ubuntu-amd64"),
 	)
 	c.Assert(err, jc.ErrorIsNil)

api/controller/caasoperatorupgrader/client.go

@@ -34,13 +34,13 @@ func NewClient(caller base.APICaller, options ...Option) *Client {
 }
 
 // Upgrade upgrades the operator for the specified agent tag to v.
-func (c *Client) Upgrade(agentTag string, v version.Number) error {
+func (c *Client) Upgrade(ctx context.Context, agentTag string, v version.Number) error {
 	var result params.ErrorResult
 	arg := params.KubernetesUpgradeArg{
 		AgentTag: agentTag,
 		Version:  v,
 	}
-	if err := c.facade.FacadeCall(context.TODO(), "UpgradeOperator", arg, &result); err != nil {
+	if err := c.facade.FacadeCall(ctx, "UpgradeOperator", arg, &result); err != nil {
 		return errors.Trace(err)
 	}
 	if result.Error != nil {

api/controller/caasoperatorupgrader/client_test.go

@@ -4,6 +4,8 @@
 package caasoperatorupgrader_test
 
 import (
+	"context"
+
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/version/v2"
@@ -41,7 +43,7 @@ func (s *provisionerSuite) TestUpgrader(c *gc.C) {
 		}
 		return nil
 	})
-	err := client.Upgrade("application-foo", version.MustParse("6.6.6"))
+	err := client.Upgrade(context.Background(), "application-foo", version.MustParse("6.6.6"))
 	c.Check(err, gc.ErrorMatches, "FAIL")
 	c.Check(called, jc.IsTrue)
 }

api/testing/fakeserver.go

@@ -19,7 +19,7 @@ func FakeAPIServer(root interface{}) net.Conn {
 	serverCodec := jsoncodec.NewNet(c1)
 	serverRPC := rpc.NewConn(serverCodec, nil)
 	serverRPC.Serve(root, nil, nil)
-	serverRPC.Start(context.TODO())
+	serverRPC.Start(context.Background())
 	go func() {
 		<-serverRPC.Dead()
 		serverRPC.Close()

apiserver/common/secrets/mocks/provider_mock.go

@@ -150,7 +150,7 @@ func DrainBackendConfigInfo(
 	if !ok {
 		return nil, errors.Errorf("missing secret backend %q", backendID)
 	}
-	backendCfg, err := backendConfigInfo(model, backendID, &cfg, authTag, leadershipChecker, true)
+	backendCfg, err := backendConfigInfo(ctx, model, backendID, &cfg, authTag, leadershipChecker, true)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -193,7 +193,7 @@ func BackendConfigInfo(
 		if !ok {
 			return nil, errors.Errorf("missing secret backend %q", backendID)
 		}
-		backendCfg, err := backendConfigInfo(model, backendID, &cfg, authTag, leadershipChecker, false)
+		backendCfg, err := backendConfigInfo(ctx, model, backendID, &cfg, authTag, leadershipChecker, false)
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
@@ -203,6 +203,7 @@ func BackendConfigInfo(
 }
 
 func backendConfigInfo(
+	ctx context.Context,
 	model Model, backendID string, adminCfg *provider.ModelBackendConfig,
 	authTag names.Tag, leadershipChecker leadership.Checker, forDrain bool,
 ) (*provider.ModelBackendConfig, error) {
@@ -271,7 +272,7 @@ func backendConfigInfo(
 	}
 
 	logger.Debugf("secrets for %v:\nowned: %v\nconsumed:%v", authTag.String(), ownedRevisions, readRevisions)
-	cfg, err := p.RestrictedConfig(adminCfg, forDrain, authTag, ownedRevisions[backendID], readRevisions[backendID])
+	cfg, err := p.RestrictedConfig(ctx, adminCfg, forDrain, authTag, ownedRevisions[backendID], readRevisions[backendID])
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -603,7 +604,7 @@ func RemoveUserSecrets(
 					return errors.Trace(err)
 				}
 			}
-			if err := p.CleanupSecrets(&cfg, authTag, revs); err != nil {
+			if err := p.CleanupSecrets(ctx, &cfg, authTag, revs); err != nil {
 				return errors.Trace(err)
 			}
 			return nil

apiserver/common/secrets/secrets.go

@@ -299,7 +299,7 @@ func (s *secretsSuite) assertBackendConfigInfoLeaderUnit(c *gc.C, wanted []strin
 				ValueRef: &coresecrets.ValueRef{BackendID: "backend-id", RevisionID: "read-rev-1"},
 			}}, nil),
 	)
-	p.EXPECT().RestrictedConfig(&adminCfg, false, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
+	p.EXPECT().RestrictedConfig(context.Background(), &adminCfg, false, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
 
 	info, err := secrets.BackendConfigInfo(context.Background(), model, cloudService, credentialService, wanted, false, unitTag, leadershipChecker)
 	c.Assert(err, jc.ErrorIsNil)
@@ -412,7 +412,7 @@ func (s *secretsSuite) TestBackendConfigInfoNonLeaderUnit(c *gc.C) {
 				ValueRef: &coresecrets.ValueRef{BackendID: "backend-id", RevisionID: "app-owned-rev-3"},
 			}}, nil),
 	)
-	p.EXPECT().RestrictedConfig(&adminCfg, false, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
+	p.EXPECT().RestrictedConfig(context.Background(), &adminCfg, false, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
 
 	info, err := secrets.BackendConfigInfo(context.Background(), model, cloudService, credentialService, []string{"backend-id"}, false, unitTag, leadershipChecker)
 	c.Assert(err, jc.ErrorIsNil)
@@ -525,7 +525,7 @@ func (s *secretsSuite) TestDrainBackendConfigInfo(c *gc.C) {
 				ValueRef: &coresecrets.ValueRef{BackendID: "backend-id", RevisionID: "app-owned-rev-3"},
 			}}, nil),
 	)
-	p.EXPECT().RestrictedConfig(&adminCfg, true, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
+	p.EXPECT().RestrictedConfig(context.Background(), &adminCfg, true, unitTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
 
 	info, err := secrets.DrainBackendConfigInfo(context.Background(), "backend-id", model, cloudService, credentialService, unitTag, leadershipChecker)
 	c.Assert(err, jc.ErrorIsNil)
@@ -617,7 +617,7 @@ func (s *secretsSuite) TestBackendConfigInfoAppTagLogin(c *gc.C) {
 				ValueRef: &coresecrets.ValueRef{BackendID: "backend-id", RevisionID: "read-rev-1"},
 			}}, nil),
 	)
-	p.EXPECT().RestrictedConfig(&adminCfg, false, appTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
+	p.EXPECT().RestrictedConfig(context.Background(), &adminCfg, false, appTag, ownedRevs, readRevs).Return(&adminCfg.BackendConfig, nil)
 
 	info, err := secrets.BackendConfigInfo(context.Background(), model, cloudService, credentialService, []string{"backend-id"}, false, appTag, leadershipChecker)
 	c.Assert(err, jc.ErrorIsNil)
@@ -965,6 +965,7 @@ func (s *secretsSuite) TestRemoveSecretsForModelAdminWithRevisions(c *gc.C) {
 	mockprovider.EXPECT().NewBackend(cfg).Return(backend, nil)
 	backend.EXPECT().DeleteContent(gomock.Any(), "rev-666").Return(nil)
 	mockprovider.EXPECT().CleanupSecrets(
+		gomock.Any(),
 		cfg, names.NewUserTag("foo"),
 		provider.SecretRevisions{uri.ID: set.NewStrings("rev-666")},
 	).Return(nil)
@@ -1043,6 +1044,7 @@ func (s *secretsSuite) TestRemoveSecretsForModelAdmin(c *gc.C) {
 	mockprovider.EXPECT().NewBackend(cfg).Return(backend, nil)
 	backend.EXPECT().DeleteContent(gomock.Any(), "rev-666").Return(nil)
 	mockprovider.EXPECT().CleanupSecrets(
+		gomock.Any(),
 		cfg, names.NewUserTag("foo"),
 		provider.SecretRevisions{uri.ID: set.NewStrings("rev-666")},
 	).Return(nil)