diff --git a/.run/Template Go Test.run.xml b/.run/Template Go Test.run.xml index 323ebce4..31a4ea4f 100644 --- a/.run/Template Go Test.run.xml +++ b/.run/Template Go Test.run.xml @@ -13,7 +13,7 @@ - + diff --git a/argocd/provider.go b/argocd/provider.go index 5a923a29..80bb0a16 100644 --- a/argocd/provider.go +++ b/argocd/provider.go @@ -4,11 +4,11 @@ import ( "context" "sync" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" fwdiag "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" // Import to initialize client auth plugins. diff --git a/argocd/provider_test.go b/argocd/provider_test.go index afb9b57a..457bb675 100644 --- a/argocd/provider_test.go +++ b/argocd/provider_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/Masterminds/semver/v3" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) var testAccProviders map[string]func() (*schema.Provider, error) diff --git a/argocd/resource_argocd_account_token.go b/argocd/resource_argocd_account_token.go index c8c992c0..a2dd7b01 100644 --- a/argocd/resource_argocd_account_token.go +++ b/argocd/resource_argocd_account_token.go @@ -7,12 +7,12 @@ import ( "strings" "time" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" "github.com/cristalhq/jwt/v3" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDAccountToken() *schema.Resource { diff --git a/argocd/resource_argocd_application.go b/argocd/resource_argocd_application.go index 70000f97..2f52b084 100644 --- a/argocd/resource_argocd_application.go +++ b/argocd/resource_argocd_application.go @@ -8,14 +8,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" applicationClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/argoproj/gitops-engine/pkg/health" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDApplication() *schema.Resource { diff --git a/argocd/resource_argocd_application_set.go b/argocd/resource_argocd_application_set.go index ed82ac95..432c3ee8 100644 --- a/argocd/resource_argocd_application_set.go +++ b/argocd/resource_argocd_application_set.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/applicationset" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" - "github.com/oboukili/terraform-provider-argocd/internal/provider" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/argocd/resource_argocd_application_set_test.go b/argocd/resource_argocd_application_set_test.go index 7d912b29..76ec7f07 100644 --- a/argocd/resource_argocd_application_set_test.go +++ b/argocd/resource_argocd_application_set_test.go @@ -4,8 +4,8 @@ import ( "regexp" "testing" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func TestAccArgoCDApplicationSet_clusters(t *testing.T) { diff --git a/argocd/resource_argocd_application_test.go b/argocd/resource_argocd_application_test.go index e62c5548..912151c2 100644 --- a/argocd/resource_argocd_application_test.go +++ b/argocd/resource_argocd_application_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func TestAccArgoCDApplication(t *testing.T) { diff --git a/argocd/resource_argocd_cluster.go b/argocd/resource_argocd_cluster.go index 68307622..33bdd9e1 100644 --- a/argocd/resource_argocd_cluster.go +++ b/argocd/resource_argocd_cluster.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" clusterClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDCluster() *schema.Resource { diff --git a/argocd/resource_argocd_project.go b/argocd/resource_argocd_project.go index 99c30569..25591df5 100644 --- a/argocd/resource_argocd_project.go +++ b/argocd/resource_argocd_project.go @@ -7,12 +7,12 @@ import ( "sync" "time" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" projectClient "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDProject() *schema.Resource { diff --git a/argocd/resource_argocd_project_test.go b/argocd/resource_argocd_project_test.go index bcd1aa9c..29fb915e 100644 --- a/argocd/resource_argocd_project_test.go +++ b/argocd/resource_argocd_project_test.go @@ -5,9 +5,9 @@ import ( "regexp" "testing" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func TestAccArgoCDProject(t *testing.T) { diff --git a/argocd/resource_argocd_project_token.go b/argocd/resource_argocd_project_token.go index 4e14bdb5..660e50fd 100644 --- a/argocd/resource_argocd_project_token.go +++ b/argocd/resource_argocd_project_token.go @@ -8,11 +8,11 @@ import ( "sync" "time" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" "github.com/cristalhq/jwt/v3" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDProjectToken() *schema.Resource { diff --git a/argocd/resource_argocd_repository.go b/argocd/resource_argocd_repository.go index b5e4e5bf..275e38ee 100644 --- a/argocd/resource_argocd_repository.go +++ b/argocd/resource_argocd_repository.go @@ -6,12 +6,12 @@ import ( "regexp" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDRepository() *schema.Resource { diff --git a/argocd/resource_argocd_repository_certificate.go b/argocd/resource_argocd_repository_certificate.go index 2a40167d..93cc986c 100644 --- a/argocd/resource_argocd_repository_certificate.go +++ b/argocd/resource_argocd_repository_certificate.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) type ( diff --git a/argocd/resource_argocd_repository_credentials.go b/argocd/resource_argocd_repository_credentials.go index 0741f870..1af5b73b 100644 --- a/argocd/resource_argocd_repository_credentials.go +++ b/argocd/resource_argocd_repository_credentials.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/provider" ) func resourceArgoCDRepositoryCredentials() *schema.Resource { diff --git a/argocd/resource_argocd_repository_credentials_test.go b/argocd/resource_argocd_repository_credentials_test.go index 01729961..91936181 100644 --- a/argocd/resource_argocd_repository_credentials_test.go +++ b/argocd/resource_argocd_repository_credentials_test.go @@ -22,7 +22,7 @@ func TestAccArgoCDRepositoryCredentials(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccArgoCDRepositoryCredentialsSimple( - "https://github.com/oboukili/terraform-provider-argocd", + "https://github.com/argoproj-labs/terraform-provider-argocd", ), }, { diff --git a/argocd/structure_application_set.go b/argocd/structure_application_set.go index d134e796..c87d6408 100644 --- a/argocd/structure_application_set.go +++ b/argocd/structure_application_set.go @@ -5,9 +5,9 @@ import ( "fmt" "reflect" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" application "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/argocd/utils.go b/argocd/utils.go index 48e0fab9..86b05feb 100644 --- a/argocd/utils.go +++ b/argocd/utils.go @@ -6,11 +6,11 @@ import ( "strconv" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/argoproj/argo-cd/v2/server/rbacpolicy" fwdiag "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func convertStringToInt64(s string) (i int64, err error) { diff --git a/go.mod b/go.mod index 1dc90a08..e332be46 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/oboukili/terraform-provider-argocd +module github.com/argoproj-labs/terraform-provider-argocd go 1.22.0 diff --git a/internal/diagnostics/diagnostics.go b/internal/diagnostics/diagnostics.go index 3dcb99ce..7d4a462b 100644 --- a/internal/diagnostics/diagnostics.go +++ b/internal/diagnostics/diagnostics.go @@ -3,8 +3,8 @@ package diagnostics import ( "fmt" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func ArgoCDAPIError(action, resource, id string, err error) diag.Diagnostics { diff --git a/internal/provider/data_source_application.go b/internal/provider/data_source_application.go index 00009bec..50e2a341 100644 --- a/internal/provider/data_source_application.go +++ b/internal/provider/data_source_application.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/diagnostics" "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/oboukili/terraform-provider-argocd/internal/diagnostics" ) // Ensure provider defined types fully satisfy framework interfaces. diff --git a/internal/provider/data_source_application_test.go b/internal/provider/data_source_application_test.go index ea7b3d18..660ff3ec 100644 --- a/internal/provider/data_source_application_test.go +++ b/internal/provider/data_source_application_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) func TestAccArgoCDApplicationDataSource(t *testing.T) { diff --git a/internal/provider/model_application.go b/internal/provider/model_application.go index e1698cb1..2b200e7a 100644 --- a/internal/provider/model_application.go +++ b/internal/provider/model_application.go @@ -1,6 +1,8 @@ package provider import ( + "github.com/argoproj-labs/terraform-provider-argocd/internal/utils" + "github.com/argoproj-labs/terraform-provider-argocd/internal/validators" "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/elliotchance/pie/v2" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -8,8 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/oboukili/terraform-provider-argocd/internal/utils" - "github.com/oboukili/terraform-provider-argocd/internal/validators" ) type applicationModel struct { diff --git a/internal/provider/model_gpg_key.go b/internal/provider/model_gpg_key.go index 3bbd6dd8..c217bd5e 100644 --- a/internal/provider/model_gpg_key.go +++ b/internal/provider/model_gpg_key.go @@ -1,12 +1,12 @@ package provider import ( + customtypes "github.com/argoproj-labs/terraform-provider-argocd/internal/types" "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/types" - customtypes "github.com/oboukili/terraform-provider-argocd/internal/types" ) type gpgKeyModel struct { diff --git a/internal/provider/model_metadata.go b/internal/provider/model_metadata.go index 5abbfaab..6edaf9d9 100644 --- a/internal/provider/model_metadata.go +++ b/internal/provider/model_metadata.go @@ -3,13 +3,13 @@ package provider import ( "fmt" + "github.com/argoproj-labs/terraform-provider-argocd/internal/utils" + "github.com/argoproj-labs/terraform-provider-argocd/internal/validators" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/oboukili/terraform-provider-argocd/internal/utils" - "github.com/oboukili/terraform-provider-argocd/internal/validators" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/provider/model_provider.go b/internal/provider/model_provider.go index a61cf664..f52a5c8e 100644 --- a/internal/provider/model_provider.go +++ b/internal/provider/model_provider.go @@ -6,6 +6,7 @@ import ( "fmt" "net/url" + "github.com/argoproj-labs/terraform-provider-argocd/internal/diagnostics" "github.com/argoproj/argo-cd/v2/cmd/argocd/commands/headless" "github.com/argoproj/argo-cd/v2/pkg/apiclient" "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" @@ -14,7 +15,6 @@ import ( "github.com/argoproj/argo-cd/v2/util/localconfig" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/oboukili/terraform-provider-argocd/internal/diagnostics" apimachineryschema "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/rest" diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index 1d89fe70..9c1d27c9 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/Masterminds/semver/v3" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/oboukili/terraform-provider-argocd/internal/features" ) // testAccProtoV6ProviderFactories are used to instantiate a provider during diff --git a/internal/provider/resource_gpg_key.go b/internal/provider/resource_gpg_key.go index bb8dc3b6..6cba0d37 100644 --- a/internal/provider/resource_gpg_key.go +++ b/internal/provider/resource_gpg_key.go @@ -5,6 +5,8 @@ import ( "fmt" "strings" + "github.com/argoproj-labs/terraform-provider-argocd/internal/diagnostics" + "github.com/argoproj-labs/terraform-provider-argocd/internal/sync" "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey" "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -12,8 +14,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/oboukili/terraform-provider-argocd/internal/diagnostics" - "github.com/oboukili/terraform-provider-argocd/internal/sync" ) // Ensure provider defined types fully satisfy framework interfaces. diff --git a/internal/provider/server_interface.go b/internal/provider/server_interface.go index 10affe4e..747caa20 100644 --- a/internal/provider/server_interface.go +++ b/internal/provider/server_interface.go @@ -8,6 +8,8 @@ import ( "sync" "github.com/Masterminds/semver/v3" + "github.com/argoproj-labs/terraform-provider-argocd/internal/diagnostics" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/argoproj/argo-cd/v2/pkg/apiclient" "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" @@ -24,8 +26,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/oboukili/terraform-provider-argocd/internal/diagnostics" - "github.com/oboukili/terraform-provider-argocd/internal/features" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/internal/provider/server_interface_test.go b/internal/provider/server_interface_test.go index c2b9296c..b6bcd3be 100644 --- a/internal/provider/server_interface_test.go +++ b/internal/provider/server_interface_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/Masterminds/semver/v3" + "github.com/argoproj-labs/terraform-provider-argocd/internal/features" "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" - "github.com/oboukili/terraform-provider-argocd/internal/features" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/main.go b/main.go index 8d3cffbf..e1a4329b 100644 --- a/main.go +++ b/main.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-mux/tf5to6server" "github.com/hashicorp/terraform-plugin-mux/tf6muxserver" - "github.com/oboukili/terraform-provider-argocd/argocd" - "github.com/oboukili/terraform-provider-argocd/internal/provider" + "github.com/argoproj-labs/terraform-provider-argocd/argocd" + "github.com/argoproj-labs/terraform-provider-argocd/internal/provider" ) // Run "go generate" to format example terraform files and generate the docs for the registry/website