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.

Sign up for GitHub

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: align with github renaming #60

Merged
merged 2 commits into from
Nov 5, 2024
Merged

fix: align with github renaming #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4636d7a
fix: align with github renaming
1riatsila1 Nov 5, 2024
fee0608
save this for next PR
1riatsila1 Nov 5, 2024
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
4 changes: 2 additions & 2 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ generate-config-api-client: retrieve-config-api-openapi-spec
--output /local/{{ CONFIG_API_CLIENT_DIR }} \
--package-name config_api_client \
--git-user-id aruba-uxi \
--git-repo-id configuration-api-terraform-provider/{{ CONFIG_API_CLIENT_DIR }} \
--git-repo-id terraform-provider-configuration-api/{{ CONFIG_API_CLIENT_DIR }} \
--openapi-normalizer SET_TAGS_FOR_ALL_OPERATIONS=configuration
just tidy-client
just fmt-client
Expand Down Expand Up @@ -72,7 +72,7 @@ tidy-provider:
cd {{ CONFIG_API_PROVIDER_DIR }} go mod tidy

test-provider +ARGS='':
cd {{ CONFIG_API_PROVIDER_DIR }} && TF_ACC=1 go test -v ./... -race -covermode=atomic -coverprofile=.coverage {{ ARGS }}
cd {{ CONFIG_API_PROVIDER_DIR }} && TF_ACC=1 go test -v ./test/mocked/... -race -covermode=atomic -coverprofile=.coverage {{ ARGS }}

generate-provider-docs:
cd {{ TOOLS_PROVIDER_DIR }} && go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate --provider-dir ../{{ CONFIG_API_PROVIDER_DIR }} --provider-name uxi
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/aruba-uxi/configuration-api-terraform-provider
module github.com/aruba-uxi/terraform-provider-configuration-api

go 1.21

toolchain go1.22.5

require (
github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client v0.0.0-00010101000000-000000000000
github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client v0.0.0-00010101000000-000000000000
github.com/h2non/gock v1.2.0
github.com/hashicorp/terraform-plugin-framework v1.10.0
github.com/hashicorp/terraform-plugin-go v0.23.0
Expand Down Expand Up @@ -68,4 +68,4 @@ require (
google.golang.org/protobuf v1.34.0 // indirect
)

replace github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client => ./pkg/config-api-client
replace github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client => ./pkg/config-api-client
4 changes: 2 additions & 2 deletions internal/provider/datasources/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/network_group_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/sensor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/sensor_group_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/wired_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/datasources/wireless_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"context"
"os"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/datasources"
"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/resources"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/datasources"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/resources"
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/provider"
"github.com/hashicorp/terraform-plugin-framework/provider/schema"
"github.com/hashicorp/terraform-plugin-framework/resource"

"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/types"
"net/http"

Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"

"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"

"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/network_group_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"

"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/sensor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"

"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/sensor_group_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/resources/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package resources
import (
"context"

// "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
// "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/service_group_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"

"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/wired_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/resources/wireless_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/util"
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/util/error_handling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"net/url"

config_api_client "github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
)

func GenerateErrorSummary(actionName string, entityName string) string {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/util/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package util

import (
"github.com/aruba-uxi/configuration-api-terraform-provider/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
)

func IsRoot(group config_api_client.GroupsGetItem) bool {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/util/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"time"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider/config"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider/config"
)

func RetryFor429[T any](f func() (T, *http.Response, error)) (T, *http.Response, error) {
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"flag"
"log"

"github.com/aruba-uxi/configuration-api-terraform-provider/internal/provider"
"github.com/aruba-uxi/terraform-provider-configuration-api/internal/provider"
"github.com/hashicorp/terraform-plugin-framework/providerserver"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/config-api-client/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading