Rename LoadForFile to LoadCreationRuleForFile (getsops#663)

rochaporto · Jun 22, 2020 · 13789ea · 13789ea
1 parent 25237c5
commit 13789ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/sops/main.go b/cmd/sops/main.go
@@ -1071,7 +1071,7 @@ func loadConfig(c *cli.Context, file string, kmsEncryptionContext map[string]*st
 			return nil, nil
 		}
 	}
-	conf, err := config.LoadForFile(configPath, file, kmsEncryptionContext)
+	conf, err := config.LoadCreationRuleForFile(configPath, file, kmsEncryptionContext)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/sops/subcommand/updatekeys/updatekeys.go b/cmd/sops/subcommand/updatekeys/updatekeys.go
@@ -44,7 +44,7 @@ func updateFile(opts Opts) error {
 	if err != nil {
 		return err
 	}
-	conf, err := config.LoadForFile(opts.ConfigPath, opts.InputPath, make(map[string]*string))
+	conf, err := config.LoadCreationRuleForFile(opts.ConfigPath, opts.InputPath, make(map[string]*string))
 	if err != nil {
 		return err
 	}

diff --git a/config/config.go b/config/config.go
@@ -323,18 +323,18 @@ func parseCreationRuleForFile(conf *configFile, filePath string, kmsEncryptionCo
 	return config, nil
 }
 
-// LoadForFile load the configuration for a given SOPS file from the config file at confPath. A kmsEncryptionContext
+// LoadCreationRuleForFile load the configuration for a given SOPS file from the config file at confPath. A kmsEncryptionContext
 // should be provided for configurations that do not contain key groups, as there's no way to specify context inside
 // a SOPS config file outside of key groups.
-func LoadForFile(confPath string, filePath string, kmsEncryptionContext map[string]*string) (*Config, error) {
+func LoadCreationRuleForFile(confPath string, filePath string, kmsEncryptionContext map[string]*string) (*Config, error) {
 	conf, err := loadConfigFile(confPath)
 	if err != nil {
 		return nil, err
 	}
 	return parseCreationRuleForFile(conf, filePath, kmsEncryptionContext)
 }
 
-// LoadDestinationRuleForFile works the same as LoadForFile, but gets the "creation_rule" from the matching destination_rule's
+// LoadDestinationRuleForFile works the same as LoadCreationRuleForFile, but gets the "creation_rule" from the matching destination_rule's
 // "recreation_rule".
 func LoadDestinationRuleForFile(confPath string, filePath string, kmsEncryptionContext map[string]*string) (*Config, error) {
 	conf, err := loadConfigFile(confPath)