ceng-576-add-hf-upstream

Author: BartoszBlizniak

cloudsmith/resource_repository_upstream.go

@@ -14,22 +14,23 @@ import (
 
 // upstream types
 const (
-	Cargo    = "cargo"
-	Composer = "composer"
-	Conda    = "conda"
-	Cran     = "cran"
-	Dart     = "dart"
-	Deb      = "deb"
-	Docker   = "docker"
-	Go       = "go"
-	Helm     = "helm"
-	Maven    = "maven"
-	Npm      = "npm"
-	NuGet    = "nuget"
-	Python   = "python"
-	Rpm      = "rpm"
-	Ruby     = "ruby"
-	Swift    = "swift"
+	Cargo       = "cargo"
+	Composer    = "composer"
+	Conda       = "conda"
+	Cran        = "cran"
+	Dart        = "dart"
+	Deb         = "deb"
+	Docker      = "docker"
+	Go          = "go"
+	Helm        = "helm"
+	HuggingFace = "huggingface"
+	Maven       = "maven"
+	Npm         = "npm"
+	NuGet       = "nuget"
+	Python      = "python"
+	Rpm         = "rpm"
+	Ruby        = "ruby"
+	Swift       = "swift"
 )
 
 // tf state prop names
@@ -78,6 +79,7 @@ var (
 		Docker,
 		Go,
 		Helm,
+		HuggingFace,
 		Maven,
 		Npm,
 		NuGet,
@@ -373,6 +375,24 @@ func resourceRepositoryUpstreamCreate(d *schema.ResourceData, m interface{}) err
 			VerifySsl:    verifySsl,
 		})
 		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamHelmCreateExecute(req)
+	case HuggingFace:
+		req := pc.APIClient.ReposApi.ReposUpstreamHuggingfaceCreate(pc.Auth, namespace, repository)
+		req = req.Data(cloudsmith.HuggingfaceUpstreamRequest{
+			AuthMode:     authMode,
+			AuthSecret:   authSecret,
+			AuthUsername: authUsername,
+			ExtraHeader1: extraHeader1,
+			ExtraHeader2: extraHeader2,
+			ExtraValue1:  extraValue1,
+			ExtraValue2:  extraValue2,
+			IsActive:     isActive,
+			Mode:         mode,
+			Name:         name,
+			Priority:     priority,
+			UpstreamUrl:  upstreamUrl,
+			VerifySsl:    verifySsl,
+		})
+		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamHuggingfaceCreateExecute(req)
 	case Maven:
 		req := pc.APIClient.ReposApi.ReposUpstreamMavenCreate(pc.Auth, namespace, repository)
 		req = req.Data(cloudsmith.MavenUpstreamRequest{
@@ -570,6 +590,9 @@ func getUpstream(d *schema.ResourceData, m interface{}) (Upstream, *http.Respons
 	case Helm:
 		req := pc.APIClient.ReposApi.ReposUpstreamHelmRead(pc.Auth, namespace, repository, d.Id())
 		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamHelmReadExecute(req)
+	case HuggingFace:
+		req := pc.APIClient.ReposApi.ReposUpstreamHuggingfaceRead(pc.Auth, namespace, repository, d.Id())
+		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamHuggingfaceReadExecute(req)
 	case Maven:
 		req := pc.APIClient.ReposApi.ReposUpstreamMavenRead(pc.Auth, namespace, repository, d.Id())
 		upstream, resp, err = pc.APIClient.ReposApi.ReposUpstreamMavenReadExecute(req)
@@ -864,6 +887,24 @@ func resourceRepositoryUpstreamUpdate(d *schema.ResourceData, m interface{}) err
 			VerifySsl:    verifySsl,
 		})
 		upstream, _, err = pc.APIClient.ReposApi.ReposUpstreamHelmUpdateExecute(req)
+	case HuggingFace:
+		req := pc.APIClient.ReposApi.ReposUpstreamHuggingfaceUpdate(pc.Auth, namespace, repository, slugPerm)
+		req = req.Data(cloudsmith.HuggingfaceUpstreamRequest{
+			AuthMode:     authMode,
+			AuthSecret:   authSecret,
+			AuthUsername: authUsername,
+			ExtraHeader1: extraHeader1,
+			ExtraHeader2: extraHeader2,
+			ExtraValue1:  extraValue1,
+			ExtraValue2:  extraValue2,
+			IsActive:     isActive,
+			Mode:         mode,
+			Name:         name,
+			Priority:     priority,
+			UpstreamUrl:  upstreamUrl,
+			VerifySsl:    verifySsl,
+		})
+		upstream, _, err = pc.APIClient.ReposApi.ReposUpstreamHuggingfaceUpdateExecute(req)
 	case Maven:
 		req := pc.APIClient.ReposApi.ReposUpstreamMavenUpdate(pc.Auth, namespace, repository, slugPerm)
 		req = req.Data(cloudsmith.MavenUpstreamRequest{
@@ -1055,6 +1096,9 @@ func resourceRepositoryUpstreamDelete(d *schema.ResourceData, m interface{}) err
 	case Helm:
 		req := pc.APIClient.ReposApi.ReposUpstreamHelmDelete(pc.Auth, namespace, repository, d.Id())
 		_, err = pc.APIClient.ReposApi.ReposUpstreamHelmDeleteExecute(req)
+	case HuggingFace:
+		req := pc.APIClient.ReposApi.ReposUpstreamHuggingfaceDelete(pc.Auth, namespace, repository, d.Id())
+		_, err = pc.APIClient.ReposApi.ReposUpstreamHuggingfaceDeleteExecute(req)
 	case Maven:
 		req := pc.APIClient.ReposApi.ReposUpstreamMavenDelete(pc.Auth, namespace, repository, d.Id())
 		_, err = pc.APIClient.ReposApi.ReposUpstreamMavenDeleteExecute(req)

cloudsmith/resource_repository_upstream_test.go

@@ -856,6 +856,99 @@ resource "cloudsmith_repository_upstream" "helm" {
 	})
 }
 
+func TestAccRepositoryUpstreamHuggingface_basic(t *testing.T) {
+	t.Parallel()
+
+	const huggingfaceUpstreamResourceName = "cloudsmith_repository_upstream.hugging_face"
+
+	testAccRepositoryHuggingfaceUpstreamConfigBasic := fmt.Sprintf(`
+resource "cloudsmith_repository" "test" {
+	name      = "terraform-acc-test-upstream-huggingface"
+	namespace = "%s"
+}
+
+resource "cloudsmith_repository_upstream" "hugging_face" {
+    namespace     = cloudsmith_repository.test.namespace
+    repository    = cloudsmith_repository.test.slug
+	name          = cloudsmith_repository.test.name
+    upstream_type = "huggingface"
+    upstream_url  = "https://huggingface.co"
+}
+`, namespace)
+
+	testAccRepositoryHuggingfaceUpstreamConfigUpdate := fmt.Sprintf(`
+	resource "cloudsmith_repository" "test" {
+		name      = "terraform-acc-test-upstream-huggingface"
+		namespace = "%s"
+	}
+
+	resource "cloudsmith_repository_upstream" "hugging_face" {
+		extra_header_1 = "X-Custom-Header"
+	    extra_header_2 = "Access-Control-Allow-Origin"
+	    extra_value_1  = "custom-value"
+	    extra_value_2  = "*"
+	    namespace      = cloudsmith_repository.test.namespace
+	    repository     = cloudsmith_repository.test.slug
+		name           = cloudsmith_repository.test.name
+	    upstream_type  = "huggingface"
+	    upstream_url   = "https://huggingface.co"
+	}
+	`, namespace)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccRepositoryUpstreamCheckDestroy(huggingfaceUpstreamResourceName),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRepositoryHuggingfaceUpstreamConfigBasic,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, AuthMode, "None"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, AuthUsername, ""),
+					resource.TestCheckResourceAttrSet(huggingfaceUpstreamResourceName, CreatedAt),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraHeader1, ""),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraHeader2, ""),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraValue1, ""),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraValue2, ""),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, IsActive, "true"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, Mode, "Proxy Only"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, Name, "terraform-acc-test-upstream-huggingface"),
+					resource.TestCheckResourceAttrSet(huggingfaceUpstreamResourceName, Priority),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, UpstreamType, "huggingface"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, UpstreamUrl, "https://huggingface.co"),
+					resource.TestCheckResourceAttrSet(huggingfaceUpstreamResourceName, UpdatedAt),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, VerifySsl, "true"),
+				),
+			},
+			{
+				Config: testAccRepositoryHuggingfaceUpstreamConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraHeader1, "X-Custom-Header"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraHeader2, "Access-Control-Allow-Origin"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraValue1, "custom-value"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, ExtraValue2, "*"),
+					resource.TestCheckResourceAttr(huggingfaceUpstreamResourceName, IsActive, "true"),
+				),
+			},
+			{
+				ResourceName: huggingfaceUpstreamResourceName,
+				ImportState:  true,
+				ImportStateIdFunc: func(s *terraform.State) (string, error) {
+					resourceState := s.RootModule().Resources[huggingfaceUpstreamResourceName]
+					return fmt.Sprintf(
+						"%s.%s.%s.%s",
+						resourceState.Primary.Attributes[Namespace],
+						resourceState.Primary.Attributes[Repository],
+						resourceState.Primary.Attributes[UpstreamType],
+						resourceState.Primary.Attributes[SlugPerm],
+					), nil
+				},
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccRepositoryUpstreamMaven_basic(t *testing.T) {
 	t.Parallel()
 
@@ -1647,6 +1740,9 @@ func testAccRepositoryUpstreamCheckDestroy(resourceName string) resource.TestChe
 		case Helm:
 			req := pc.APIClient.ReposApi.ReposUpstreamHelmRead(pc.Auth, namespace, repository, slugPerm)
 			_, resp, err = pc.APIClient.ReposApi.ReposUpstreamHelmReadExecute(req)
+		case HuggingFace:
+			req := pc.APIClient.ReposApi.ReposUpstreamHuggingfaceRead(pc.Auth, namespace, repository, slugPerm)
+			_, resp, err = pc.APIClient.ReposApi.ReposUpstreamHuggingfaceReadExecute(req)
 		case Maven:
 			req := pc.APIClient.ReposApi.ReposUpstreamMavenRead(pc.Auth, namespace, repository, slugPerm)
 			_, resp, err = pc.APIClient.ReposApi.ReposUpstreamMavenReadExecute(req)

docs/resources/repository_upstream.md

@@ -159,6 +159,18 @@ resource "cloudsmith_repository_upstream" "helm_charts" {
 }
 ```
 
+### HuggingFace
+
+```hcl
+resource "cloudsmith_repository_upstream" "hugging_face" {
+    name          = "HuggingFace"
+    namespace     = "${data.cloudsmith_organization.my_organization.slug_perm}"
+    repository    = "${resource.cloudsmith_repository.my_repository.slug_perm}"
+    upstream_type = "huggingface"
+    upstream_url  = "https://huggingface.co"
+}
+```
+
 ### Maven
 
 ```hcl
@@ -271,7 +283,7 @@ The following arguments are supported:
 |       `priority`        |    N     |    number    |                                                           N/A                                                           |                                                                      Upstream sources are selected for resolving requests by sequential order (1..n), followed by creation date.                                                                      |
 |      `repository`       |    Y     |    string    |                                                           N/A                                                           |                                                                                                     The Repository to which the upstream belongs.                                                                                                     |
 | `upstream_distribution` |    N     |    string    |                                                           N/A                                                           |                                    Used only in conjunction with an `upstream_type` of `"deb"` to declare the [distribution](https://wiki.debian.org/DebianRepository/Format#Overview) to fetch from the upstream.                                    |
-|     `upstream_type`     |    Y     |    string    | `"cargo"`<br>`"composer"`<br>`"conda"`<br>`"cran"`<br>`"dart"`<br>`"deb"`<br>`"docker"`<br>`"go"`<br>`"helm"`<br>`"maven"`<br>`"npm"`<br>`"nuget"`<br>`"python"`<br>`"rpm"`<br>`"ruby"`<br>`"swift"` | The type of Upstream. |
+|     `upstream_type`     |    Y     |    string    | `"cargo"`<br>`"composer"`<br>`"conda"`<br>`"cran"`<br>`"dart"`<br>`"deb"`<br>`"docker"`<br>`"go"`<br>`"helm"`<br>`"huggingface"`<br>`"maven"`<br>`"npm"`<br>`"nuget"`<br>`"python"`<br>`"rpm"`<br>`"ruby"`<br>`"swift"` | The type of Upstream. |
 |     `upstream_url`      |    Y     |    string    |                                                           N/A                                                           |                                                    The URL for this upstream source. This must be a fully qualified URL including any path elements required to reach the root of the repository. The URL cannot end with a trailing slash.                                                     |
 |      `verify_ssl`       |    N     |     bool     |                                                           N/A                                                           | If enabled, SSL certificates are verified when requests are made to this upstream. It's recommended to leave this enabled for all public sources to help mitigate Man-In-The-Middle (MITM) attacks. Please note this only applies to HTTPS upstreams. |