From 321b2a162b000d2b29531a4ea047d949251c95ae Mon Sep 17 00:00:00 2001 From: Qi Feng Huo Date: Tue, 18 Jun 2024 08:59:27 +0800 Subject: [PATCH] agent-config: generate agent-config and fix lint err - Create agent config toml Like CDH when createVM instance Signed-off-by: Qi Feng Huo --- src/cloud-api-adaptor/cmd/process-user-data/main.go | 5 ++--- src/cloud-api-adaptor/go.mod | 1 - src/cloud-api-adaptor/go.sum | 2 -- src/cloud-api-adaptor/pkg/adaptor/cloud/cloud.go | 2 +- src/cloud-api-adaptor/pkg/agent/config.go | 10 +++++----- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/cloud-api-adaptor/cmd/process-user-data/main.go b/src/cloud-api-adaptor/cmd/process-user-data/main.go index 06b6f8ab0..d5ac81ef3 100644 --- a/src/cloud-api-adaptor/cmd/process-user-data/main.go +++ b/src/cloud-api-adaptor/cmd/process-user-data/main.go @@ -7,7 +7,6 @@ import ( "os" cmdUtil "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/cmd" - "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/agent" "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/cdh" daemon "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/forwarder" "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/pkg/userdata" @@ -19,7 +18,7 @@ const ( providerAzure = "azure" providerAws = "aws" - defaultAuthJsonPath = "/run/peerpod/auth.json" + defaultAuthJsonPath = "/run/peerpod/auth.json" ) var versionFlag bool @@ -36,7 +35,7 @@ var rootCmd = &cobra.Command{ } func init() { - var agentConfigPath, cdhConfigPath, daemonConfigPath string + var cdhConfigPath, daemonConfigPath string var fetchTimeout int rootCmd.PersistentFlags().BoolVarP(&versionFlag, "version", "v", false, "Print the version") diff --git a/src/cloud-api-adaptor/go.mod b/src/cloud-api-adaptor/go.mod index db8e1efc8..b10bfa779 100644 --- a/src/cloud-api-adaptor/go.mod +++ b/src/cloud-api-adaptor/go.mod @@ -55,7 +55,6 @@ require ( github.com/pelletier/go-toml/v2 v2.1.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 - github.com/tj/assert v0.0.3 golang.org/x/crypto v0.22.0 golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 google.golang.org/protobuf v1.33.0 diff --git a/src/cloud-api-adaptor/go.sum b/src/cloud-api-adaptor/go.sum index 5d0df8452..209439382 100644 --- a/src/cloud-api-adaptor/go.sum +++ b/src/cloud-api-adaptor/go.sum @@ -546,8 +546,6 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= -github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs= github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= diff --git a/src/cloud-api-adaptor/pkg/adaptor/cloud/cloud.go b/src/cloud-api-adaptor/pkg/adaptor/cloud/cloud.go index d759e4ce4..b7bfc550b 100644 --- a/src/cloud-api-adaptor/pkg/adaptor/cloud/cloud.go +++ b/src/cloud-api-adaptor/pkg/adaptor/cloud/cloud.go @@ -288,7 +288,7 @@ func (s *cloudService) CreateVM(ctx context.Context, req *pb.CreateVMRequest) (r Content: toml, }) } - toml, err := agent.CreateConfigFile(daemonConfig.AAKBCParams); + toml, err := agent.CreateConfigFile(daemonConfig.AAKBCParams) if err == nil { cloudConfig.WriteFiles = append(cloudConfig.WriteFiles, cloudinit.WriteFile{ Path: agent.DefaultAgentConfigPath, diff --git a/src/cloud-api-adaptor/pkg/agent/config.go b/src/cloud-api-adaptor/pkg/agent/config.go index 6b1d96ac4..d0692816e 100644 --- a/src/cloud-api-adaptor/pkg/agent/config.go +++ b/src/cloud-api-adaptor/pkg/agent/config.go @@ -19,15 +19,15 @@ type AgentConfig struct { } func CreateConfigFile(aaKBCParams string) (string, error) { - config := AgentConfig { - ServerAddr: ServerAddr, - AaKbcParams: aaKBCParams, + config := AgentConfig{ + ServerAddr: ServerAddr, + AaKbcParams: aaKBCParams, ImageRegistryAuthFile: DefaultAuthJsonPath, - GuestComponentsProcs: GuestComponentsProcs, + GuestComponentsProcs: GuestComponentsProcs, } bytes, err := toml.Marshal(config) if err != nil { return "", err } return string(bytes), nil -} +}