Remove odata package in favour of github.com/hashicorp/go-azure-sdk/s…

…dk/odata
manicminer · Feb 23, 2023 · 134f21a · 134f21a
1 parent 39e882c
commit 134f21a
Show file tree

Hide file tree

Showing 89 changed files with 83 additions and 973 deletions.
diff --git a/.github/workflows/odata-tests.yml b/.github/workflows/odata-tests.yml
diff --git a/README.md b/README.md
@@ -31,8 +31,8 @@ import (
 
 	"github.com/hashicorp/go-azure-sdk/sdk/auth"
 	"github.com/hashicorp/go-azure-sdk/sdk/environments"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 var (

diff --git a/aadgraph/client.go b/aadgraph/client.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/hashicorp/go-azure-sdk/sdk/auth"
 	"github.com/hashicorp/go-azure-sdk/sdk/environments"
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type ApiVersion string
@@ -309,7 +309,7 @@ func (c Client) Get(ctx context.Context, input GetHttpRequestInput) (*http.Respo
 
 		// Get the next page, recursively
 		nextInput := input
-		nextInput.rawUri = *firstOdata.NextLink
+		nextInput.rawUri = string(*firstOdata.NextLink)
 		nextResp, status, o, err := c.Get(ctx, nextInput)
 		if err != nil {
 			return resp, status, o, err

diff --git a/example/example.go b/example/example.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/hashicorp/go-azure-sdk/sdk/auth"
 	"github.com/hashicorp/go-azure-sdk/sdk/environments"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 var (

diff --git a/internal/cmd/test-cleanup/administrativeunits.go b/internal/cmd/test-cleanup/administrativeunits.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupAdministrativeUnits() {

diff --git a/internal/cmd/test-cleanup/applications.go b/internal/cmd/test-cleanup/applications.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupApplications() {

diff --git a/internal/cmd/test-cleanup/conditionalaccesspolicies.go b/internal/cmd/test-cleanup/conditionalaccesspolicies.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupConditionalAccessPolicies() {

diff --git a/internal/cmd/test-cleanup/groups.go b/internal/cmd/test-cleanup/groups.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupGroups() {

diff --git a/internal/cmd/test-cleanup/namedlocations.go b/internal/cmd/test-cleanup/namedlocations.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupNamedLocations() {

diff --git a/internal/cmd/test-cleanup/schemaextensions.go b/internal/cmd/test-cleanup/schemaextensions.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupSchemaExtensions() {

diff --git a/internal/cmd/test-cleanup/serviceprincipals.go b/internal/cmd/test-cleanup/serviceprincipals.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupServicePrincipals() {

diff --git a/internal/cmd/test-cleanup/users.go b/internal/cmd/test-cleanup/users.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func cleanupUsers() {

diff --git a/msgraph/accesspackage.go b/msgraph/accesspackage.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageClient struct {

diff --git a/msgraph/accesspackage_test.go b/msgraph/accesspackage_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageClient(t *testing.T) {

diff --git a/msgraph/accesspackageassignmentpolicy.go b/msgraph/accesspackageassignmentpolicy.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageAssignmentPolicyClient struct {

diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageAssignmentPolicyClient(t *testing.T) {

diff --git a/msgraph/accesspackageassignmentrequest.go b/msgraph/accesspackageassignmentrequest.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageAssignmentRequestClient struct {

diff --git a/msgraph/accesspackageassignmentrequest_test.go b/msgraph/accesspackageassignmentrequest_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageAssignmentRequestClient(t *testing.T) {

diff --git a/msgraph/accesspackagecatalog.go b/msgraph/accesspackagecatalog.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageCatalogClient struct {

diff --git a/msgraph/accesspackagecatalog_test.go b/msgraph/accesspackagecatalog_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageCatalogClient(t *testing.T) {

diff --git a/msgraph/accesspackageresource.go b/msgraph/accesspackageresource.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageResourceClient struct {

diff --git a/msgraph/accesspackageresourcerequest.go b/msgraph/accesspackageresourcerequest.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/manicminer/hamilton/internal/utils"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type AccessPackageResourceRequestClient struct {

diff --git a/msgraph/accesspackageresourcerequest_test.go b/msgraph/accesspackageresourcerequest_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageResourceRequestClient(t *testing.T) {

diff --git a/msgraph/accesspackageresourcerolescope.go b/msgraph/accesspackageresourcerolescope.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/utils"
-	"github.com/manicminer/hamilton/odata"
 )
 
 type AccessPackageResourceRoleScopeClient struct {

diff --git a/msgraph/accesspackageresourcerolescope_test.go b/msgraph/accesspackageresourcerolescope_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAccessPackageResourceRoleScopeClient(t *testing.T) {

diff --git a/msgraph/administrative_units.go b/msgraph/administrative_units.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 // AdministrativeUnitsClient performs operations on Administrative Units

diff --git a/msgraph/administrative_units_test.go b/msgraph/administrative_units_test.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAdministrativeUnitsClient(t *testing.T) {

diff --git a/msgraph/app_role_assignments.go b/msgraph/app_role_assignments.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 type appRoleAssignmentsResourceType string

diff --git a/msgraph/app_role_assignments_test.go b/msgraph/app_role_assignments_test.go
@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/hashicorp/go-uuid"
-
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAppRoleAssignedToClient(t *testing.T) {

diff --git a/msgraph/application_templates.go b/msgraph/application_templates.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 // ApplicationTemplatesClient performs operations on ApplicationTemplates.

diff --git a/msgraph/application_templates_test.go b/msgraph/application_templates_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 const testApplicationTemplateId = "4601ed45-8ff3-4599-8377-b6649007e876" // Marketo

diff --git a/msgraph/applications.go b/msgraph/applications.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 // ApplicationsClient performs operations on Applications.

diff --git a/msgraph/applications_test.go b/msgraph/applications_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestApplicationsClient(t *testing.T) {

diff --git a/msgraph/authentication_methods.go b/msgraph/authentication_methods.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 // AuthenticationMethodsClient performs operations on the Authentications methods endpoint under Identity and Sign-in

diff --git a/msgraph/authentication_methods_test.go b/msgraph/authentication_methods_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 	"github.com/manicminer/hamilton/internal/test"
 	"github.com/manicminer/hamilton/internal/utils"
 	"github.com/manicminer/hamilton/msgraph"
-	"github.com/manicminer/hamilton/odata"
 )
 
 func TestAuthenticationMethodsClient(t *testing.T) {

diff --git a/msgraph/b2c_userflow.go b/msgraph/b2c_userflow.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/manicminer/hamilton/odata"
+	"github.com/hashicorp/go-azure-sdk/sdk/odata"
 )
 
 // B2CUserFlowClient performs operations on B2CUserFlow.