fix main branch testing

OpsLevel · Oct 3, 2023 · 3cd168e · 3cd168e
1 parent 8b13b8c
commit 3cd168e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 47 deletions.
diff --git a/check_has_owner.go b/check_has_owner.go
@@ -1,28 +1,28 @@
 package opslevel
 
 type ServiceOwnershipCheckFragment struct {
-	RequireContactMethod *bool                             `graphql:"requireContactMethod"`
-	ContactMethod        *ServiceOwnershipCheckContactType `graphql:"contactMethod"`
-	TeamTagKey           string                            `graphql:"tagKey"`
-	TeamTagPredicate     *Predicate                        `graphql:"tagPredicate"`
+	RequireContactMethod *bool        `graphql:"requireContactMethod"`
+	ContactMethod        *ContactType `graphql:"contactMethod"`
+	TeamTagKey           string       `graphql:"tagKey"`
+	TeamTagPredicate     *Predicate   `graphql:"tagPredicate"`
 }
 
 type CheckServiceOwnershipCreateInput struct {
 	CheckCreateInput
 
-	RequireContactMethod *bool                             `json:"requireContactMethod,omitempty"`
-	ContactMethod        *ServiceOwnershipCheckContactType `json:"contactMethod,omitempty"`
-	TeamTagKey           string                            `json:"tagKey,omitempty"`
-	TeamTagPredicate     *PredicateInput                   `json:"tagPredicate,omitempty"`
+	RequireContactMethod *bool           `json:"requireContactMethod,omitempty"`
+	ContactMethod        *ContactType    `json:"contactMethod,omitempty"`
+	TeamTagKey           string          `json:"tagKey,omitempty"`
+	TeamTagPredicate     *PredicateInput `json:"tagPredicate,omitempty"`
 }
 
 type CheckServiceOwnershipUpdateInput struct {
 	CheckUpdateInput
 
-	RequireContactMethod *bool                             `json:"requireContactMethod,omitempty"`
-	ContactMethod        *ServiceOwnershipCheckContactType `json:"contactMethod,omitempty"`
-	TeamTagKey           string                            `json:"tagKey,omitempty"`
-	TeamTagPredicate     *PredicateUpdateInput             `json:"tagPredicate,omitempty"`
+	RequireContactMethod *bool                 `json:"requireContactMethod,omitempty"`
+	ContactMethod        *ContactType          `json:"contactMethod,omitempty"`
+	TeamTagKey           string                `json:"tagKey,omitempty"`
+	TeamTagPredicate     *PredicateUpdateInput `json:"tagPredicate,omitempty"`
 }
 
 func (client *Client) CreateCheckServiceOwnership(input CheckServiceOwnershipCreateInput) (*Check, error) {

diff --git a/check_test.go b/check_test.go
@@ -321,7 +321,7 @@ var testcases = map[string]struct {
 	"CreateServiceOwnership": {
 		fixture: "check/create_service_ownership",
 		body: func(c *ol.Client) (*ol.Check, error) {
-			slackType := ol.ServiceOwnershipCheckContactTypeSlack
+			slackType := ol.ContactTypeSlack
 			return c.CreateCheckServiceOwnership(ol.CheckServiceOwnershipCreateInput{
 				CheckCreateInput:     checkCreateInput,
 				RequireContactMethod: ol.Bool(true),
@@ -337,7 +337,7 @@ var testcases = map[string]struct {
 	"UpdateServiceOwnership": {
 		fixture: "check/update_service_ownership",
 		body: func(c *ol.Client) (*ol.Check, error) {
-			emailType := ol.ServiceOwnershipCheckContactTypeEmail
+			emailType := ol.ContactTypeEmail
 			return c.UpdateCheckServiceOwnership(ol.CheckServiceOwnershipUpdateInput{
 				CheckUpdateInput:     checkUpdateInput,
 				RequireContactMethod: ol.Bool(true),

diff --git a/clientGQL.go b/clientGQL.go
@@ -3,10 +3,11 @@ package opslevel
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/go-retryablehttp"
-	"github.com/hasura/go-graphql-client"
 	"net/http"
 	"strings"
+
+	"github.com/hashicorp/go-retryablehttp"
+	"github.com/hasura/go-graphql-client"
 )
 
 type Client struct {

diff --git a/enum.go b/enum.go
diff --git a/infra_test.go b/infra_test.go
@@ -250,13 +250,13 @@ func TestGetInfrastructureResourceTags(t *testing.T) {
 	// Arrange
 	requests := []TestRequest{
 		{
-			`{"query": "query InfrastructureResourceTags($after:String!$first:Int!$infrastructureResource:IdentifierInput!){account{infrastructureResource(input: $infrastructureResource){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
+			Request: `{"query": "query InfrastructureResourceTags($after:String!$first:Int!$infrastructureResource:IdentifierInput!){account{infrastructureResource(input: $infrastructureResource){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
             "variables": {
                 {{ template "first_page_variables" }},
                 "infrastructureResource": {"id": "Z2lkOi8vb3BzbGV2ZWwvUmVwb3NpdG9yaWVzOjpHaXRsYWIvMTA5ODc"}
             }
             }`,
-			`{
+			Response: `{
                   "data": {
                     "account": {
                       "infrastructureResource": {
@@ -287,13 +287,13 @@ func TestGetInfrastructureResourceTags(t *testing.T) {
                 }`,
 		},
 		{
-			`{"query": "query InfrastructureResourceTags($after:String!$first:Int!$infrastructureResource:IdentifierInput!){account{infrastructureResource(input: $infrastructureResource){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
+			Request: `{"query": "query InfrastructureResourceTags($after:String!$first:Int!$infrastructureResource:IdentifierInput!){account{infrastructureResource(input: $infrastructureResource){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
             "variables": {
                 {{ template "second_page_variables" }},
                 "infrastructureResource": {"id": "Z2lkOi8vb3BzbGV2ZWwvUmVwb3NpdG9yaWVzOjpHaXRsYWIvMTA5ODc"}
             }
             }`,
-			`{
+			Response: `{
                   "data": {
                     "account": {
                       "infrastructureResource": {

diff --git a/user_test.go b/user_test.go
@@ -254,12 +254,12 @@ func TestGetUserTags(t *testing.T) {
 	// Arrange
 	requests := []TestRequest{
 		{
-			`{"query": "query UserTagsList($after:String!$first:Int!$user:ID!){account{user(id: $user){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
+			Request: `{"query": "query UserTagsList($after:String!$first:Int!$user:ID!){account{user(id: $user){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
             "variables": {
               {{ template "first_page_variables" }},
               "user": "{{ template "id1"}}"
             }}`,
-			`{
+			Response: `{
         "data": {
           "account": {
             "user": {
@@ -290,13 +290,13 @@ func TestGetUserTags(t *testing.T) {
       }`,
 		},
 		{
-			`{"query": "query UserTagsList($after:String!$first:Int!$user:ID!){account{user(id: $user){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
+			Request: `{"query": "query UserTagsList($after:String!$first:Int!$user:ID!){account{user(id: $user){tags(after: $after, first: $first){nodes{id,key,value},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount}}}}",
             "variables": {
                 {{ template "second_page_variables" }},
                 "user": "{{ template "id1"}}"
             }
             }`,
-			`{
+			Response: `{
         "data": {
           "account": {
             "user": {