fix: read and pass NetApp key

Artonus · Feb 27, 2024 · 9aa6161 · 9aa6161
1 parent e1d9c03
commit 9aa6161
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -2,4 +2,5 @@ FETCH_DIR=./fetch
 POST_DIR=./post
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
+AWS_REGION=
+NETAPP_KEY=
diff --git a/cmd/fetch.go b/cmd/fetch.go
@@ -20,14 +20,15 @@ var fetchCmd = &cobra.Command{
 		region := os.Getenv("AWS_REGION")
 		bucket := os.Getenv("AWS_BUCKET")
 		fetchDir := os.Getenv("FETCH_DIR")
-		cfg := config.NewConfig(accessKey, secretKey, config.WithFetchDir(fetchDir), config.WithBucket(bucket), config.WithRegion(region))
+		key := os.Getenv("NETAPP_KEY")
+		cfg := config.NewConfig(accessKey, secretKey, config.WithFetchDir(fetchDir), config.WithBucket(bucket), config.WithRegion(region), config.WithKey(key))
 
 		fetchClient, err := cmdutil.CreateFetchClient(cfg)
 		if err != nil {
 			panic(err)
 		}
 
-		err = fetchClient.Fetch("", fetchDir)
+		err = fetchClient.Fetch(cfg.Key, fetchDir)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/post.go b/cmd/post.go
@@ -22,7 +22,8 @@ var postCmd = &cobra.Command{
 		region := os.Getenv("AWS_REGION")
 		bucket := os.Getenv("AWS_BUCKET")
 		postDir := os.Getenv("POST_DIR")
-		cfg := config.NewConfig(accessKey, secretKey, config.WithPostDir(postDir), config.WithBucket(bucket), config.WithRegion(region))
+		key := os.Getenv("NETAPP_KEY")
+		cfg := config.NewConfig(accessKey, secretKey, config.WithPostDir(postDir), config.WithBucket(bucket), config.WithRegion(region), config.WithKey(key))
 
 		postClient, err := cmdutil.CreatePostClient(cfg)
 		if err != nil {
@@ -39,7 +40,7 @@ var postCmd = &cobra.Command{
 		// Notify the channel when a SIGTERM signal is received
 		fmt.Printf("Received signal: %v\n", sigReceived)
 		// Upload the data to S3
-		err = postClient.Post("", postDir)
+		err = postClient.Post(cfg.Key, postDir)
 		if err != nil {
 			return err
 		}

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -7,6 +7,7 @@ type HermesConfig struct {
 	AwsBucket          string
 	FetchDir           string
 	PostDir            string
+	Key                string
 }
 
 type HermesOption func(*HermesConfig)
@@ -32,6 +33,11 @@ func WithPostDir(postDir string) HermesOption {
 		c.PostDir = postDir
 	}
 }
+func WithKey(key string) HermesOption {
+	return func(c *HermesConfig) {
+		c.Key = key
+	}
+}
 
 func NewConfig(awsAccessKeyId, awsAccessSecretKey string, opts ...HermesOption) *HermesConfig {
 	if awsAccessKeyId == "" || awsAccessSecretKey == "" {