Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change go module path to new repo location #474

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .run/Template Go Test.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</envs>
<framework value="gotest" />
<kind value="DIRECTORY" />
<package value="github.com/oboukili/terraform-provider-argocd" />
<package value="github.com/argoproj-labs/terraform-provider-argocd" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$" />
<method v="2" />
Expand Down
2 changes: 1 addition & 1 deletion argocd/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion argocd/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_account_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions argocd/resource_argocd_application.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions argocd/resource_argocd_application_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_application_set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions argocd/resource_argocd_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_project_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_repository_certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_repository_credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion argocd/resource_argocd_repository_credentials_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
},
{
Expand Down
2 changes: 1 addition & 1 deletion argocd/structure_application_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion argocd/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/oboukili/terraform-provider-argocd
module github.com/argoproj-labs/terraform-provider-argocd

go 1.22.0

Expand Down
2 changes: 1 addition & 1 deletion internal/diagnostics/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/data_source_application.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/data_source_application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/model_application.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
"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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/model_gpg_key.go
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/model_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/model_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resource_gpg_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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"
"github.com/hashicorp/terraform-plugin-framework/path"
"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.
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/server_interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/provider/server_interface_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading