Skip to content

Commit

Permalink
Merge branch 'main' into ay/feat/acceptance-tests/data-source/groups
Browse files Browse the repository at this point in the history
  • Loading branch information
1riatsila1 authored Nov 11, 2024
2 parents 184c413 + 3fc8aca commit 162ad6b
Show file tree
Hide file tree
Showing 63 changed files with 287 additions and 283 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ go_path = $(go env GOPATH)/bin

```
dev_overrides {
"registry.terraform.io/arubauxi/configuration" = "<go_path>"
"registry.terraform.io/arubauxi/hpeuxi" = "<go_path>"
}
```

Example `~/.terraformrc` file
```
provider_installation {
dev_overrides {
"registry.terraform.io/arubauxi/configuration" = "/Users/<user>/go/bin"
"registry.terraform.io/arubauxi/hpeuxi" = "/Users/<user>/go/bin"
}
direct {}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/full-demo/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
uxi = {
source = "registry.terraform.io/arubauxi/configuration"
source = "registry.terraform.io/arubauxi/hpeuxi"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/aruba-uxi/terraform-provider-configuration
module github.com/aruba-uxi/terraform-provider-hpeuxi

go 1.21

toolchain go1.22.5

require (
github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client v0.0.0-00010101000000-000000000000
github.com/aruba-uxi/terraform-provider-hpeuxi/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/terraform-provider-configuration-api/pkg/config-api-client => ./pkg/config-api-client
replace github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client => ./pkg/config-api-client
4 changes: 2 additions & 2 deletions internal/provider/datasources/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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/agent_group_assignment.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package datasources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"context"
"os"

"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/datasources"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/resources"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/datasources"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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/agent_group_assignment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/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.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package resources

import (
"context"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"

"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package resources

import (
"context"
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
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/terraform-provider-configuration-api/pkg/config-api-client"
config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
)

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

import (
"github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
"github.com/aruba-uxi/terraform-provider-hpeuxi/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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"time"

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

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

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

Expand All @@ -28,7 +28,7 @@ func main() {
flag.Parse()

opts := providerserver.ServeOpts{
Address: "registry.terraform.io/arubauxi/configuration",
Address: "registry.terraform.io/arubauxi/hpeuxi",
Debug: debug,
}

Expand Down
3 changes: 1 addition & 2 deletions pkg/config-api-client/README.md

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

Loading

0 comments on commit 162ad6b

Please sign in to comment.