Merge pull request #130 from jfrog/GH-129-allow-dots-and-dashes-in-re…

…po-name

Gh 129 allow dots and dashes in repo name

GNUmakefile

@@ -36,9 +36,9 @@ attach:
 	dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient attach $$(pgrep terraform-provider-artifactory)
 
 acceptance: fmtcheck
-	TF_ACC=1
+	export TF_ACC=1
 	test -n ARTIFACTORY_USERNAME && test -n ARTIFACTORY_PASSWORD && test -n ARTIFACTORY_URL \
-		&& go test -v -parallel 1 ./pkg/... timeout 120m
+		&& go test -v -parallel 20 ./pkg/...
 
 
 fmt:

pkg/artifactory/resource_artifactory_local_repository.go

@@ -282,7 +282,10 @@ func resourceLocalRepositoryDelete(d *schema.ResourceData, m interface{}) error
 }
 
 func resourceLocalRepositoryExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	_, err := m.(*resty.Client).R().Head(repositoriesEndpoint + d.Id())
+	newClient := m.(*resty.Client)
+	_, err := newClient.AddRetryCondition(func(response *resty.Response, err error) bool {
+		return response.StatusCode() == 400
+	}).R().Head(repositoriesEndpoint + d.Id())
 	// artifactory returns 400 instead of 404. but regardless, it's an error
 	return err == nil, err
 }

pkg/artifactory/resource_artifactory_remote_repository_test.go

@@ -9,7 +9,36 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
+func TestAccLocalAllowDotsAndDashesInKeyGH129(t *testing.T) {
+	_, fqrn, name := mkNames("terraform-local-test-repo-basic", "artifactory_remote_repository")
 
+	key := fmt.Sprintf("debian-remote.teleport%d",randomInt())
+	localRepositoryBasic := fmt.Sprintf(`
+		resource "artifactory_remote_repository" "%s" {
+			key              = "%s"
+			package_type     = "debian"
+			repo_layout_ref  = "simple-default"
+			url              = "https://deb.releases.teleport.dev/"
+			notes            = "managed by terraform"
+			property_sets    = ["artifactory"]
+			includes_pattern = "**/*"
+			content_synchronisation {
+				enabled = false
+			}
+		}
+	`,name, key )
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		CheckDestroy: testAccCheckRepositoryDestroy(fqrn),
+		Providers:    testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: localRepositoryBasic,
+				Check: resource.TestCheckResourceAttr(fqrn, "key", key),
+			},
+		},
+	})
+}
 func TestKeyHasSpecialCharsFails(t *testing.T) {
 	const failKey = `
 		resource "artifactory_remote_repository" "terraform-remote-test-repo-basic" {

pkg/artifactory/util.go

@@ -160,27 +160,7 @@ func mkLens(d *schema.ResourceData) func(key string, value interface{}) []error
 	}
 }
 
-// HashStrings hashcode was moved to internal in terraform-plugin-sdk, and schema does not expose a wrapper of hashcode.Strings
-func HashStrings(strings []string) string {
-	var buf bytes.Buffer
 
-	for _, s := range strings {
-		buf.WriteString(fmt.Sprintf("%s-", s))
-	}
-
-	return fmt.Sprintf("%d", schema.HashString(buf.String()))
-}
-func cascadingErr(hasErr *bool) func(error) {
-	if hasErr == nil {
-		panic("hasError cannot be nil")
-	}
-	return func(err error) {
-		if err != nil {
-			fmt.Println(err)
-			*hasErr = true
-		}
-	}
-}
 
 func sendConfigurationPatch(content []byte, m interface{}) error {
 

pkg/artifactory/validators.go

@@ -530,7 +530,7 @@ func validateIsEmail(address interface{}, _ string) ([]string, []error) {
 
 var repoKeyValidator = validation.All(
 	validation.StringDoesNotMatch(regexp.MustCompile("^[0-9].*"), "repo key cannot start with a number"),
-	validation.StringDoesNotContainAny(" !@#$%^&*()_+={}[]:;<>,./?~`|\\"),
+	validation.StringDoesNotContainAny(" !@#$%^&*()_+={}[]:;<>,/?~`|\\"),
 )
 
 func fileExist(value interface{}, _ string) ([]string, []error) {