From da3cc06a02d6ae3c61e8faed869509a3f0f01334 Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:17:49 +0200 Subject: [PATCH 1/6] refactor: Point to Marfeel's fork --- dockerhub/provider.go | 2 +- dockerhub/resource_group.go | 2 +- dockerhub/resource_repository.go | 2 +- dockerhub/resource_repository_test.go | 2 +- dockerhub/resource_repositorygroup.go | 2 +- dockerhub/resource_token.go | 2 +- dockerhub/resource_token_test.go | 2 +- go.mod | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dockerhub/provider.go b/dockerhub/provider.go index 05466d7..358ccfe 100644 --- a/dockerhub/provider.go +++ b/dockerhub/provider.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - rtd "github.com/BarnabyShearer/dockerhub/v2" + rtd "github.com/Marfeel/dockerhub/v2" ) func Provider() *schema.Provider { diff --git a/dockerhub/resource_group.go b/dockerhub/resource_group.go index 349e0b7..5aacaa6 100644 --- a/dockerhub/resource_group.go +++ b/dockerhub/resource_group.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func resourceGroup() *schema.Resource { diff --git a/dockerhub/resource_repository.go b/dockerhub/resource_repository.go index 763a7ce..b6e555f 100644 --- a/dockerhub/resource_repository.go +++ b/dockerhub/resource_repository.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func resourceRepository() *schema.Resource { diff --git a/dockerhub/resource_repository_test.go b/dockerhub/resource_repository_test.go index 8770c01..930cb2c 100644 --- a/dockerhub/resource_repository_test.go +++ b/dockerhub/resource_repository_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func TestAccDockerhubRepository_basic(t *testing.T) { diff --git a/dockerhub/resource_repositorygroup.go b/dockerhub/resource_repositorygroup.go index 74d6550..5254a16 100644 --- a/dockerhub/resource_repositorygroup.go +++ b/dockerhub/resource_repositorygroup.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func resourceRepositoryGroup() *schema.Resource { diff --git a/dockerhub/resource_token.go b/dockerhub/resource_token.go index dae7ec2..d9e1d7a 100644 --- a/dockerhub/resource_token.go +++ b/dockerhub/resource_token.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func resourceToken() *schema.Resource { diff --git a/dockerhub/resource_token_test.go b/dockerhub/resource_token_test.go index 5638534..de4b80a 100644 --- a/dockerhub/resource_token_test.go +++ b/dockerhub/resource_token_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - dh "github.com/BarnabyShearer/dockerhub/v2" + dh "github.com/Marfeel/dockerhub/v2" ) func toGenericArray(old []string) []interface{} { diff --git a/go.mod b/go.mod index 4c54ccf..0a9c9b0 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/BarnabyShearer/terraform-provider-dockerhub go 1.16 require ( - github.com/BarnabyShearer/dockerhub/v2 v2.1.0 + github.com/Marfeel/dockerhub/v2 v2.1.0 github.com/agext/levenshtein v1.2.3 // indirect github.com/hashicorp/terraform-plugin-docs v0.13.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1 From 9fdfa9318cbdde4877cb5afc9ea174420422b286 Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:18:07 +0200 Subject: [PATCH 2/6] refactor: Point to Marfeel's fork Separate commit as this might need to be reverted, because the hashes might not match --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 64eb806..89c32ee 100644 --- a/go.sum +++ b/go.sum @@ -360,8 +360,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BarnabyShearer/dockerhub/v2 v2.1.0 h1:g0WJWuFrcSyKK43xPgryRHS/28WYpbwiBGdPgE5ybgs= -github.com/BarnabyShearer/dockerhub/v2 v2.1.0/go.mod h1:z5UKZBcwG+G4G+ZepWmzbdS7lPY/jTC8q/mcVKJIyWc= +github.com/Marfeel/dockerhub/v2 v2.1.0 h1:g0WJWuFrcSyKK43xPgryRHS/28WYpbwiBGdPgE5ybgs= +github.com/Marfeel/dockerhub/v2 v2.1.0/go.mod h1:z5UKZBcwG+G4G+ZepWmzbdS7lPY/jTC8q/mcVKJIyWc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= From f4a4ebec08fad09b0d81e78334aafba2403dac8c Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:42:19 +0200 Subject: [PATCH 3/6] feat: Use Marfeel's newly released tag --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0a9c9b0..b5985b5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/BarnabyShearer/terraform-provider-dockerhub go 1.16 require ( - github.com/Marfeel/dockerhub/v2 v2.1.0 + github.com/Marfeel/dockerhub/v2 v2.2.0 github.com/agext/levenshtein v1.2.3 // indirect github.com/hashicorp/terraform-plugin-docs v0.13.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1 diff --git a/go.sum b/go.sum index 89c32ee..135a684 100644 --- a/go.sum +++ b/go.sum @@ -360,8 +360,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Marfeel/dockerhub/v2 v2.1.0 h1:g0WJWuFrcSyKK43xPgryRHS/28WYpbwiBGdPgE5ybgs= -github.com/Marfeel/dockerhub/v2 v2.1.0/go.mod h1:z5UKZBcwG+G4G+ZepWmzbdS7lPY/jTC8q/mcVKJIyWc= +github.com/Marfeel/dockerhub/v2 v2.2.0 h1:1yTUwnTi8hiIgsjBq3i4KTrpHlX7sOIqyoNjK49trYQ= +github.com/Marfeel/dockerhub/v2 v2.2.0/go.mod h1:0oJJy/ogptA+kYjmrviXU/GEwDkj09XrqsQ2lw/9KNg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= From cb9f533896e6ee642b97d1daa19f4ebd45cc1a10 Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:46:27 +0200 Subject: [PATCH 4/6] refactor: Point to Marfeel's fork --- go.mod | 2 +- main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b5985b5..a537655 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/BarnabyShearer/terraform-provider-dockerhub +module github.com/Marfeel/terraform-provider-dockerhub go 1.16 diff --git a/main.go b/main.go index b2624cb..65bb7d3 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/BarnabyShearer/terraform-provider-dockerhub/dockerhub" + "github.com/Marfeel/terraform-provider-dockerhub/dockerhub" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" ) From 4d1aa487a5bd5f628072fa9df453e0ff1e1b49ff Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:49:16 +0200 Subject: [PATCH 5/6] docs: Point to Marfeel's fork --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6060fdc..823f4fb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![registry.terraform.io](https://img.shields.io/badge/terraform-docs-success)](https://registry.terraform.io/providers/BarnabyShearer/dockerhub/latest/docs) -![Build Status](https://github.com/BarnabyShearer/terraform-provider-dockerhub/actions/workflows/publish.yml/badge.svg) +![Build Status](https://github.com/Marfeel/terraform-provider-dockerhub/actions/workflows/publish.yml/badge.svg) Lifecycle management of Docker Hub using the v2 API. From 6c3ed9fddbcb44f96a658434b20353bbecb56373 Mon Sep 17 00:00:00 2001 From: Iago Alonso Date: Mon, 8 Jul 2024 10:50:38 +0200 Subject: [PATCH 6/6] chore: Point to Marfeel's fork --- Makefile | 4 ++-- README.md | 4 ++-- docs/index.md | 2 +- examples/provider/installation.tf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5a1ca3f..2f37e81 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ testacc: test TF_ACC=1 go test ./... install: terraform-provider-dockerhub - mkdir -p ~/.terraform.d/plugins/registry.terraform.io/BarnabyShearer/dockerhub/0.1.0/linux_amd64 - cp $+ ~/.terraform.d/plugins/registry.terraform.io/BarnabyShearer/dockerhub/0.1.0/linux_amd64 + mkdir -p ~/.terraform.d/plugins/registry.terraform.io/Marfeel/dockerhub/0.1.0/linux_amd64 + cp $+ ~/.terraform.d/plugins/registry.terraform.io/Marfeel/dockerhub/0.1.0/linux_amd64 -rm .terraform.lock.hcl terraform init diff --git a/README.md b/README.md index 823f4fb..d92084f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ======= # Docker Hub Provider -[![registry.terraform.io](https://img.shields.io/badge/terraform-docs-success)](https://registry.terraform.io/providers/BarnabyShearer/dockerhub/latest/docs) +[![registry.terraform.io](https://img.shields.io/badge/terraform-docs-success)](https://registry.terraform.io/providers/Marfeel/dockerhub/latest/docs) ![Build Status](https://github.com/Marfeel/terraform-provider-dockerhub/actions/workflows/publish.yml/badge.svg) @@ -21,7 +21,7 @@ terraform { required_providers { dockerhub = { - source = "BarnabyShearer/dockerhub" + source = "Marfeel/dockerhub" version = ">= 0.0.15" } } diff --git a/docs/index.md b/docs/index.md index 9bcb4b5..23add85 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,7 +22,7 @@ terraform { required_providers { dockerhub = { - source = "BarnabyShearer/dockerhub" + source = "Marfeel/dockerhub" version = ">= 0.0.15" } } diff --git a/examples/provider/installation.tf b/examples/provider/installation.tf index 2b1454c..afa904f 100644 --- a/examples/provider/installation.tf +++ b/examples/provider/installation.tf @@ -3,7 +3,7 @@ terraform { required_providers { dockerhub = { - source = "BarnabyShearer/dockerhub" + source = "Marfeel/dockerhub" version = ">= 0.0.15" } }