Change naming of function and struct and clean up code

Signed-off-by: Omar Miraj <[email protected]>

Author: MOmarMiraj

plugins/ngrok/credentials.go

@@ -45,7 +45,7 @@ func Credentials() schema.CredentialType {
 				},
 			},
 		},
-		DefaultProvisioner: fileProvisioner{},
+		DefaultProvisioner: ngrokProvisioner{},
 		Importer: importer.TryAll(
 			importer.TryEnvVarPair(defaultEnvVarMapping),
 			importer.MacOnly(

plugins/ngrok/credentials_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestCredentialsProvisioner(t *testing.T) {
-	plugintest.TestProvisioner(t, fileProvisioner{}, map[string]plugintest.ProvisionCase{
+	plugintest.TestProvisioner(t, ngrokProvisioner{}, map[string]plugintest.ProvisionCase{
 		"temp file": {
 			ItemFields: map[sdk.FieldName]string{
 				fieldname.Authtoken: "cxG2Im21Yzkh8VnvFQaetlPHcQ9ZDUUk1IzzyHhcGcEXAMPLE",

plugins/ngrok/provisioner.go

@@ -25,10 +25,10 @@ const (
 	envVarAuthVersion = "v3.2.1"
 )
 
-type fileProvisioner struct {
+type ngrokProvisioner struct {
 }
 
-func IsNgrokAPIKeySupported() bool {
+func HasEnvVarSupport() bool {
 	currentVersion, err := getNgrokVersion()
 	if err != nil {
 		// When ngrok version check fails for any reason,
@@ -49,10 +49,9 @@ func IsNgrokAPIKeySupported() bool {
 	return false
 }
 
-func (f fileProvisioner) Provision(ctx context.Context, in sdk.ProvisionInput, out *sdk.ProvisionOutput) {
-	ngrokProvisioner := IsNgrokAPIKeySupported()
+func (p ngrokProvisioner) Provision(ctx context.Context, in sdk.ProvisionInput, out *sdk.ProvisionOutput) {
 
-	if ngrokProvisioner {
+	if ngrokProvisioner := HasEnvVarSupport(); ngrokProvisioner {
 		out.AddEnvVar("NGROK_AUTHTOKEN", in.ItemFields[fieldname.Authtoken])
 		out.AddEnvVar("NGROK_API_KEY", in.ItemFields[fieldname.APIKey])
 		return
@@ -145,10 +144,10 @@ func getNgrokVersion() (string, error) {
 	return currentVersion, nil
 }
 
-func (f fileProvisioner) Deprovision(ctx context.Context, in sdk.DeprovisionInput, out *sdk.DeprovisionOutput) {
+func (p ngrokProvisioner) Deprovision(ctx context.Context, in sdk.DeprovisionInput, out *sdk.DeprovisionOutput) {
 	// nothing to do here: files get deleted automatically by 1Password CLI and environment variables get wiped when process exits
 }
 
-func (f fileProvisioner) Description() string {
+func (p ngrokProvisioner) Description() string {
 	return "If ngrok version is 3.2.1 or higher than provision ngrok credentials as environment variables NGROK_AUTH_TOKEN and NGROK_API_KEY otherwise config file aware provisioner. It will first check if an already existing config file is present."
 }