Remove filterAllow function when fetching Vault backend ids (#972)

* Issue #964 remove filterAllow function when fetching Vault backend ids. filtering of this sort can be done using the regular filtering mechanism

* add vault_mount resource

Author: ethpran

providers/vault/vault_provider.go

@@ -87,6 +87,7 @@ func getSupportedMountServices() map[string]terraformutils.ServiceGenerator {
 func (p *Provider) GetSupportedService() map[string]terraformutils.ServiceGenerator {
 	generators := getSupportedMountServices()
 	generators["policy"] = &ServiceGenerator{resource: "policy"}
+	generators["mount"] = &ServiceGenerator{resource: "mount"}
 	generators["generic_secret"] = &ServiceGenerator{resource: "generic_secret", mountType: "kv"}
 	return generators
 }

providers/vault/vault_service_generator.go

@@ -49,6 +49,8 @@ func (g *ServiceGenerator) InitResources() error {
 		return g.createPolicyResources()
 	case "generic_secret":
 		return g.createGenericSecretResources()
+	case "mount":
+		return g.createMountResources()
 	default:
 		return errors.New("unsupported service type. shouldn't ever reach here")
 	}
@@ -112,33 +114,14 @@ func (g *ServiceGenerator) mountsByType() ([]string, error) {
 	}
 	var typeMounts []string
 	for name, mount := range mounts {
-		if mount.Type != g.mountType {
-			continue
-		}
-		id := strings.ReplaceAll(name, "/", "")
-		if g.filterAllow(fmt.Sprintf("%s_secret_backend", mount.Type), id) {
+		if g.mountType == "" || mount.Type == g.mountType {
+			id := strings.ReplaceAll(name, "/", "")
 			typeMounts = append(typeMounts, id)
 		}
 	}
 	return typeMounts, nil
 }
 
-func (g *ServiceGenerator) filterAllow(serviceName, id string) bool {
-	add := true
-	for _, filter := range g.Filter {
-		if filter.FieldPath == "id" &&
-			filter.IsApplicable(serviceName) {
-			for _, value := range filter.AcceptableValues {
-				add = value == id
-				if add {
-					break
-				}
-			}
-		}
-	}
-	return add
-}
-
 func (g *ServiceGenerator) createAuthBackendResources() error {
 	backends, err := g.backendsByType()
 	if err != nil {
@@ -201,9 +184,7 @@ func (g *ServiceGenerator) backendsByType() ([]string, error) {
 			continue
 		}
 		id := strings.ReplaceAll(name, "/", "")
-		if g.filterAllow(fmt.Sprintf("%s_auth_backend", authBackend.Type), id) {
-			typeBackends = append(typeBackends, id)
-		}
+		typeBackends = append(typeBackends, id)
 	}
 	return typeBackends, nil
 }
@@ -259,6 +240,23 @@ func (g *ServiceGenerator) createGenericSecretResources() error {
 	return nil
 }
 
+func (g *ServiceGenerator) createMountResources() error {
+	mounts, err := g.mountsByType()
+	if err != nil {
+		return err
+	}
+	for _, mount := range mounts {
+		g.Resources = append(g.Resources,
+			terraformutils.NewSimpleResource(
+				mount,
+				mount,
+				"vault_mount",
+				g.ProviderName,
+				[]string{}))
+	}
+	return nil
+}
+
 func (g *ServiceGenerator) PostConvertHook() error {
 	for _, resource := range g.Resources {
 		switch resource.InstanceInfo.Type {