Fix to make external-provisioner work

Author: mkimuram

params/const.go

@@ -23,7 +23,7 @@ const (
 	// fields in subsequent CSI calls or Kubernetes API objects.
 	csiParameterPrefix = "csi.storage.k8s.io/"
 
-	prefixedFsTypeKey = csiParameterPrefix + "fstype"
+	PrefixedFsTypeKey = csiParameterPrefix + "fstype"
 
 	prefixedDefaultSecretNameKey      = csiParameterPrefix + "secret-name"
 	prefixedDefaultSecretNamespaceKey = csiParameterPrefix + "secret-namespace"

params/volume.go

@@ -25,7 +25,7 @@ import (
 )
 
 var (
-	defaultSecretParams = SecretParamsMap{
+	DefaultSecretParams = SecretParamsMap{
 		name:               "Default",
 		secretNameKey:      prefixedDefaultSecretNameKey,
 		secretNamespaceKey: prefixedDefaultSecretNamespaceKey,
@@ -96,7 +96,7 @@ func GetVolumeSecretReference(secretParams SecretParamsMap, templateParams map[s
 
 	// if didn't find secrets for specific call, try to check default values
 	if nameTemplate == "" && namespaceTemplate == "" {
-		nameTemplate, namespaceTemplate, err = VerifyAndGetSecretNameAndNamespaceTemplate(defaultSecretParams, templateParams)
+		nameTemplate, namespaceTemplate, err = VerifyAndGetSecretNameAndNamespaceTemplate(DefaultSecretParams, templateParams)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get default name and namespace template from params: %v", err)
 		}
@@ -155,13 +155,13 @@ func GetVolumeSecretReference(secretParams SecretParamsMap, templateParams map[s
 	return ref, nil
 }
 
-func RemovePrefixedParameters(param map[string]string) (map[string]string, error) {
+func RemovePrefixedVolumeParameters(param map[string]string) (map[string]string, error) {
 	newParam := map[string]string{}
 	for k, v := range param {
 		if strings.HasPrefix(k, csiParameterPrefix) {
 			// Check if its well known
 			switch k {
-			case prefixedFsTypeKey:
+			case PrefixedFsTypeKey:
 			case prefixedProvisionerSecretNameKey:
 			case prefixedProvisionerSecretNamespaceKey:
 			case prefixedControllerPublishSecretNameKey:

params/volume_test.go

@@ -43,13 +43,13 @@ func TestStripPrefixedCSIParams(t *testing.T) {
 		},
 		{
 			name:           "prefix in value",
-			params:         map[string]string{"foo": prefixedFsTypeKey, "bim": "baz"},
-			expectedParams: map[string]string{"foo": prefixedFsTypeKey, "bim": "baz"},
+			params:         map[string]string{"foo": PrefixedFsTypeKey, "bim": "baz"},
+			expectedParams: map[string]string{"foo": PrefixedFsTypeKey, "bim": "baz"},
 		},
 		{
 			name: "all known prefixed",
 			params: map[string]string{
-				prefixedFsTypeKey:                           "csiBar",
+				PrefixedFsTypeKey:                           "csiBar",
 				prefixedProvisionerSecretNameKey:            "csiBar",
 				prefixedProvisionerSecretNamespaceKey:       "csiBar",
 				prefixedControllerPublishSecretNameKey:      "csiBar",
@@ -106,7 +106,7 @@ func TestStripPrefixedCSIParams(t *testing.T) {
 	for _, tc := range testcases {
 		t.Logf("test: %v", tc.name)
 
-		newParams, err := RemovePrefixedParameters(tc.params)
+		newParams, err := RemovePrefixedVolumeParameters(tc.params)
 		if err != nil {
 			if tc.expectErr {
 				continue