Code Gen v2 (#509)

* generate Go structs of graphql API objects (#499) * generate Go structs of graphql API objects * temp limit objects generated, add mapping for field types * generate first objects, update tests * generate most objects starting with A-C, update tests * generate unions (#505) * generate unions * drop unused TagOwner enums * union tpl clean up * First pass at having codegen come from the client-gen repo * Objects WIP * Objects WIP pt 2 * Objects WIP pt 3 * Objects WIP pt 4 * latest codegen * adjust for component types APIs * lint fix --------- Co-authored-by: David Bloss <[email protected]>
OpsLevel · Jan 28, 2025 · 26deeab · 26deeab
1 parent 751db02
commit 26deeab
Show file tree

Hide file tree

Showing 66 changed files with 1,815 additions and 1,426 deletions.
diff --git a/.changes/unreleased/Feature-20250127-091051.yaml b/.changes/unreleased/Feature-20250127-091051.yaml
@@ -0,0 +1,3 @@
+kind: Feature
+body: '''metadata'' field has been added to AlertSource struct'
+time: 2025-01-27T09:10:51.188114-06:00
diff --git a/.changes/unreleased/Feature-20250127-091116.yaml b/.changes/unreleased/Feature-20250127-091116.yaml
@@ -0,0 +1,3 @@
+kind: Feature
+body: '''description'' field has been added to Category struct'
+time: 2025-01-27T09:11:16.749514-06:00
diff --git a/.changes/unreleased/Feature-20250127-100537.yaml b/.changes/unreleased/Feature-20250127-100537.yaml
@@ -0,0 +1,4 @@
+kind: Feature
+body: Struct 'Scorecard' has been updated to match all the fields possible in the
+  API
+time: 2025-01-27T10:05:37.765025-06:00
diff --git a/.changes/unreleased/Refactor-20250127-084043.yaml b/.changes/unreleased/Refactor-20250127-084043.yaml
@@ -0,0 +1,3 @@
+kind: Refactor
+body: 'BREAKING CHANGE: ''OpsLevelErrors'' has been renamed to ''Error'''
+time: 2025-01-27T08:40:43.269477-06:00
diff --git a/.changes/unreleased/Refactor-20250127-084159.yaml b/.changes/unreleased/Refactor-20250127-084159.yaml
@@ -0,0 +1,4 @@
+kind: Refactor
+body: 'BREAKING CHANGE: Struct ''GoogleCloudProject'' fields `ID` and `URL` are now
+  `Id` and `Url` respectively'
+time: 2025-01-27T08:41:59.292959-06:00
diff --git a/.changes/unreleased/Refactor-20250127-100442.yaml b/.changes/unreleased/Refactor-20250127-100442.yaml
@@ -0,0 +1,4 @@
+kind: Refactor
+body: Field 'ChecksCount' has been renamed to 'TotalChecks' on the struct 'Scorecard'
+  to match the API definition
+time: 2025-01-27T10:04:42.935235-06:00
diff --git a/.changes/unreleased/Refactor-20250127-102513.yaml b/.changes/unreleased/Refactor-20250127-102513.yaml
@@ -0,0 +1,3 @@
+kind: Refactor
+body: Field 'ID' on struct 'Secret' has been renamed to 'Id' for consistency
+time: 2025-01-27T10:25:13.727106-06:00
diff --git a/.changes/unreleased/Refactor-20250127-133514.yaml b/.changes/unreleased/Refactor-20250127-133514.yaml
@@ -0,0 +1,3 @@
+kind: Refactor
+body: 'BREAKING CHANGE: struct ''OpsLevelWarnings'' was renamed to ''Warning'''
+time: 2025-01-27T13:35:14.183763-06:00
diff --git a/actions.go b/actions.go
@@ -9,28 +9,6 @@ type CustomActionsId struct {
 	Id      ID       `graphql:"id"`
 }
 
-type CustomActionsWebhookAction struct {
-	Headers    JSON                        `graphql:"headers" scalar:"true"`
-	HTTPMethod CustomActionsHttpMethodEnum `graphql:"httpMethod"`
-	WebhookURL string                      `graphql:"webhookUrl"`
-}
-
-type CustomActionsTriggerDefinition struct {
-	Action                 CustomActionsId                                 `graphql:"action"`
-	Aliases                []string                                        `graphql:"aliases"`
-	Description            string                                          `graphql:"description"`
-	Filter                 FilterId                                        `graphql:"filter"`
-	Id                     ID                                              `graphql:"id"`
-	ManualInputsDefinition string                                          `graphql:"manualInputsDefinition"`
-	Name                   string                                          `graphql:"name"`
-	Owner                  TeamId                                          `graphql:"owner"`
-	Published              bool                                            `graphql:"published"`
-	Timestamps             Timestamps                                      `graphql:"timestamps"`
-	AccessControl          CustomActionsTriggerDefinitionAccessControlEnum `graphql:"accessControl"`
-	ResponseTemplate       string                                          `graphql:"responseTemplate"`
-	EntityType             CustomActionsEntityTypeEnum                     `graphql:"entityType"`
-}
-
 func (customActionsTriggerDefinition *CustomActionsTriggerDefinition) ExtendedTeamAccess(client *Client, variables *PayloadVariables) (*TeamConnection, error) {
 	var q struct {
 		Account struct {
@@ -80,7 +58,7 @@ func (client *Client) CreateWebhookAction(input CustomActionsWebhookActionCreate
 	var m struct {
 		Payload struct {
 			WebhookAction CustomActionsExternalAction
-			Errors        []OpsLevelErrors
+			Errors        []Error
 		} `graphql:"customActionsWebhookActionCreate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -100,7 +78,7 @@ func (client *Client) GetCustomAction(input string) (*CustomActionsExternalActio
 		"input": *NewIdentifier(input),
 	}
 	err := client.Query(&q, v, WithName("ExternalActionGet"))
-	if q.Account.Action.Id == "" {
+	if q.Account.Action.CustomActionsId.Id == "" {
 		err = fmt.Errorf("CustomActionsExternalAction with ID or Alias matching '%s' not found", input)
 	}
 	return &q.Account.Action, HandleErrors(err, nil)
@@ -134,7 +112,7 @@ func (client *Client) UpdateWebhookAction(input CustomActionsWebhookActionUpdate
 	var m struct {
 		Payload struct {
 			WebhookAction CustomActionsExternalAction
-			Errors        []OpsLevelErrors
+			Errors        []Error
 		} `graphql:"customActionsWebhookActionUpdate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -147,7 +125,7 @@ func (client *Client) UpdateWebhookAction(input CustomActionsWebhookActionUpdate
 func (client *Client) DeleteWebhookAction(input string) error {
 	var m struct {
 		Payload struct {
-			Errors []OpsLevelErrors `graphql:"errors"`
+			Errors []Error `graphql:"errors"`
 		} `graphql:"customActionsWebhookActionDelete(resource: $input)"`
 	}
 	v := PayloadVariables{
@@ -161,7 +139,7 @@ func (client *Client) CreateTriggerDefinition(input CustomActionsTriggerDefiniti
 	var m struct {
 		Payload struct {
 			TriggerDefinition CustomActionsTriggerDefinition
-			Errors            []OpsLevelErrors
+			Errors            []Error
 		} `graphql:"customActionsTriggerDefinitionCreate(input: $input)"`
 	}
 	if input.AccessControl == nil {
@@ -222,7 +200,7 @@ func (client *Client) UpdateTriggerDefinition(input CustomActionsTriggerDefiniti
 	var m struct {
 		Payload struct {
 			TriggerDefinition CustomActionsTriggerDefinition
-			Errors            []OpsLevelErrors
+			Errors            []Error
 		} `graphql:"customActionsTriggerDefinitionUpdate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -235,7 +213,7 @@ func (client *Client) UpdateTriggerDefinition(input CustomActionsTriggerDefiniti
 func (client *Client) DeleteTriggerDefinition(input string) error {
 	var m struct {
 		Payload struct {
-			Errors []OpsLevelErrors `graphql:"errors"`
+			Errors []Error `graphql:"errors"`
 		} `graphql:"customActionsTriggerDefinitionDelete(resource: $input)"`
 	}
 	v := PayloadVariables{

diff --git a/actions_test.go b/actions_test.go
@@ -38,12 +38,12 @@ func TestCreateWebhookAction(t *testing.T) {
 func TestListCustomActions(t *testing.T) {
 	// Arrange
 	testRequestOne := autopilot.NewTestRequest(
-		`query ExternalActionList($after:String!$first:Int!){account{customActionsExternalActions(after: $after, first: $first){nodes{aliases,id,description,liquidTemplate,name,... on CustomActionsWebhookAction{headers,httpMethod,webhookUrl}},{{ template "pagination_request" }},totalCount}}}`,
+		`query ExternalActionList($after:String!$first:Int!){account{customActionsExternalActions(after: $after, first: $first){nodes{{ template "custom_actions_request" }},{{ template "pagination_request" }},totalCount}}}`,
 		`{{ template "pagination_initial_query_variables" }}`,
 		`{ "data": { "account": { "customActionsExternalActions": { "nodes": [ { {{ template "custom_action1_response" }} }, { {{ template "custom_action2_response" }} } ], {{ template "pagination_initial_pageInfo_response" }}, "totalCount": 2 }}}}`,
 	)
 	testRequestTwo := autopilot.NewTestRequest(
-		`query ExternalActionList($after:String!$first:Int!){account{customActionsExternalActions(after: $after, first: $first){nodes{aliases,id,description,liquidTemplate,name,... on CustomActionsWebhookAction{headers,httpMethod,webhookUrl}},{{ template "pagination_request" }},totalCount}}}`,
+		`query ExternalActionList($after:String!$first:Int!){account{customActionsExternalActions(after: $after, first: $first){nodes{{ template "custom_actions_request" }},{{ template "pagination_request" }},totalCount}}}`,
 		`{{ template "pagination_second_query_variables" }}`,
 		`{ "data": { "account": { "customActionsExternalActions": { "nodes": [ { {{ template "custom_action3_response" }} } ], {{ template "pagination_second_pageInfo_response" }}, "totalCount": 1 }}}}`,
 	)
@@ -224,12 +224,12 @@ func TestGetTriggerDefinition(t *testing.T) {
 func TestListTriggerDefinitions(t *testing.T) {
 	// Arrange
 	testRequestOne := autopilot.NewTestRequest(
-		`query TriggerDefinitionList($after:String!$first:Int!){account{customActionsTriggerDefinitions(after: $after, first: $first){nodes{action{aliases,id},aliases,description,filter{id,name},id,manualInputsDefinition,name,owner{alias,id},published,timestamps{createdAt,updatedAt},accessControl,responseTemplate,entityType},{{ template "pagination_request" }},totalCount}}}`,
+		`query TriggerDefinitionList($after:String!$first:Int!){account{customActionsTriggerDefinitions(after: $after, first: $first){nodes{{ template "custom_actions_trigger_request" }},{{ template "pagination_request" }},totalCount}}}`,
 		`{{ template "pagination_initial_query_variables" }}`,
 		`{ "data": { "account": { "customActionsTriggerDefinitions": { "nodes": [ { {{ template "custom_action_trigger1_response" }} }, { {{ template "custom_action_trigger2_response" }} } ], {{ template "pagination_initial_pageInfo_response" }}, "totalCount": 2 }}}}`,
 	)
 	testRequestTwo := autopilot.NewTestRequest(
-		`query TriggerDefinitionList($after:String!$first:Int!){account{customActionsTriggerDefinitions(after: $after, first: $first){nodes{action{aliases,id},aliases,description,filter{id,name},id,manualInputsDefinition,name,owner{alias,id},published,timestamps{createdAt,updatedAt},accessControl,responseTemplate,entityType},{{ template "pagination_request" }},totalCount}}}`,
+		`query TriggerDefinitionList($after:String!$first:Int!){account{customActionsTriggerDefinitions(after: $after, first: $first){nodes{{ template "custom_actions_trigger_request" }},{{ template "pagination_request" }},totalCount}}}`,
 		`{{ template "pagination_second_query_variables" }}`,
 		`{ "data": { "account": { "customActionsTriggerDefinitions": { "nodes": [ { {{ template "custom_action_trigger3_response" }} } ], {{ template "pagination_second_pageInfo_response" }}, "totalCount": 1 }}}}`,
 	)
@@ -316,10 +316,11 @@ func TestUpdateTriggerDefinition3(t *testing.T) {
 
 func TestDeleteTriggerDefinition(t *testing.T) {
 	// Arrange
-	request := `{"query":
-		"mutation TriggerDefinitionDelete($input:IdentifierInput!){customActionsTriggerDefinitionDelete(resource: $input){errors{message,path}}}",
-		{"input":{"alias":"123456789"}}
-	}`
+	request := autopilot.NewTestRequest(
+		`mutation TriggerDefinitionDelete($input:IdentifierInput!){customActionsTriggerDefinitionDelete(resource: $input){errors{message,path}}}`,
+		`{"input":{"alias":"123456789"}}`,
+		`{"data": {"customActionsTriggerDefinitionDelete": { "errors": [{{ template "error1" }}] }}}`,
+	)
 
 	testRequest := autopilot.NewTestRequest(
 		`mutation TriggerDefinitionDelete($input:IdentifierInput!){customActionsTriggerDefinitionDelete(resource: $input){errors{message,path}}}`,
@@ -334,7 +335,7 @@ func TestDeleteTriggerDefinition(t *testing.T) {
 
 	client := BestTestClient(t, "custom_actions/delete_trigger", testRequest)
 	clientErr := BestTestClient(t, "custom_actions/delete_trigger_err", testRequestError)
-	clientErr2 := ABetterTestClient(t, "custom_actions/delete_trigger_err2", request, "")
+	clientErr2 := BestTestClient(t, "custom_actions/delete_trigger_err2", request)
 	// Act
 	err := client.DeleteTriggerDefinition("123456789")
 	err2 := clientErr.DeleteTriggerDefinition("123456789")

diff --git a/alert_source.go b/alert_source.go
@@ -1,22 +1,5 @@
 package opslevel
 
-type AlertSource struct {
-	Description string              `graphql:"description"`
-	ExternalId  string              `graphql:"externalId"`
-	Id          ID                  `graphql:"id"`
-	Integration IntegrationId       `graphql:"integration"`
-	Name        string              `graphql:"name"`
-	Type        AlertSourceTypeEnum `graphql:"type"`
-	Url         string              `graphql:"url"`
-}
-
-type AlertSourceService struct {
-	AlertSource AlertSource               `graphql:"alertSource"`
-	Id          ID                        `graphql:"id"`
-	Service     ServiceId                 `graphql:"service"`
-	Status      AlertSourceStatusTypeEnum `graphql:"status"`
-}
-
 type AlertSourceDeleteInput struct {
 	Id ID `json:"id"`
 }
@@ -33,7 +16,7 @@ func (client *Client) CreateAlertSourceService(input AlertSourceServiceCreateInp
 	var m struct {
 		Payload struct {
 			AlertSourceService AlertSourceService
-			Errors             []OpsLevelErrors
+			Errors             []Error
 		} `graphql:"alertSourceServiceCreate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -74,7 +57,7 @@ func (client *Client) GetAlertSource(id ID) (*AlertSource, error) {
 func (client *Client) DeleteAlertSourceService(id ID) error {
 	var m struct {
 		Payload struct {
-			Errors []OpsLevelErrors
+			Errors []Error
 		} `graphql:"alertSourceServiceDelete(input: $input)"`
 	}
 	v := PayloadVariables{

diff --git a/alert_source_test.go b/alert_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestCreateAlertSourceService(t *testing.T) {
 	// Arrange
 	testRequest := autopilot.NewTestRequest(
-		`mutation AlertSourceServiceCreate($input:AlertSourceServiceCreateInput!){alertSourceServiceCreate(input: $input){alertSourceService{alertSource{description,externalId,id,integration{id,name,type},name,type,url},id,service{id,aliases},status},errors{message,path}}}`,
+		`mutation AlertSourceServiceCreate($input:AlertSourceServiceCreateInput!){alertSourceServiceCreate(input: $input){alertSourceService{alertSource{description,externalId,id,integration{id,name,type},metadata,name,type,url},id,service{id,aliases},status},errors{message,path}}}`,
 		`{"input": { "alertSourceExternalIdentifier": { "externalId": "QWERTY", "type": "datadog" }, "service": { "alias": "example" }}}`,
 		`{"data": { "alertSourceServiceCreate": { "alertSourceService": { "service": { "aliases": ["example"] }}}}}`,
 	)
@@ -28,7 +28,7 @@ func TestCreateAlertSourceService(t *testing.T) {
 func TestGetAlertSourceWithExternalIdentifier(t *testing.T) {
 	// Arrange
 	testRequest := autopilot.NewTestRequest(
-		`query AlertSourceGet($externalIdentifier:AlertSourceExternalIdentifier!){account{alertSource(externalIdentifier: $externalIdentifier){description,externalId,id,integration{id,name,type},name,type,url}}}`,
+		`query AlertSourceGet($externalIdentifier:AlertSourceExternalIdentifier!){account{alertSource(externalIdentifier: $externalIdentifier){description,externalId,id,integration{id,name,type},metadata,name,type,url}}}`,
 		`{"externalIdentifier": { "type": "datadog", "externalId": "12345678" }}`,
 		`{"data": {
         "account": {
@@ -64,7 +64,7 @@ func TestGetAlertSourceWithExternalIdentifier(t *testing.T) {
 func TestGetAlertSource(t *testing.T) {
 	// Arrange
 	testRequest := autopilot.NewTestRequest(
-		`query AlertSourceGet($id:ID!){account{alertSource(id: $id){description,externalId,id,integration{id,name,type},name,type,url}}}`,
+		`query AlertSourceGet($id:ID!){account{alertSource(id: $id){description,externalId,id,integration{id,name,type},metadata,name,type,url}}}`,
 		`{"id": "Z2lkOi8vb3BzbGV2ZWwvQWxlcnRTb3VyY2VzOjpQYWdlcmR1dHkvNjE" }`,
 		`{"data": {
         "account": {

diff --git a/aliases.go b/aliases.go
@@ -64,7 +64,7 @@ func (client *Client) CreateAlias(input AliasCreateInput) ([]string, error) {
 		Payload struct {
 			Aliases []string
 			OwnerId string
-			Errors  []OpsLevelErrors
+			Errors  []Error
 		} `graphql:"aliasCreate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -118,7 +118,7 @@ func (client *Client) DeleteAlias(input AliasDeleteInput) error {
 	var m struct {
 		Payload struct {
 			Alias  string `graphql:"deletedAlias"`
-			Errors []OpsLevelErrors
+			Errors []Error
 		} `graphql:"aliasDelete(input: $input)"`
 	}
 	v := PayloadVariables{

diff --git a/cache_test.go b/cache_test.go
@@ -20,7 +20,7 @@ func TestCache(t *testing.T) {
 		`{"data":{"account":{ "lifecycles":[{{ template "lifecycle_1" }}] }}}`,
 	)
 	testRequestThree := autopilot.NewTestRequest(
-		`query SystemsList($after:String!$first:Int!){account{systems(after: $after, first: $first){nodes{id,aliases,managedAliases,name,description,htmlUrl,owner{... on Team{teamAlias:alias,id}},parent{id,aliases,description,htmlUrl,managedAliases,name,note,owner{... on Team{teamAlias:alias,id}}},note},{{ template "pagination_request" }}}}}`,
+		`query SystemsList($after:String!$first:Int!){account{systems(after: $after, first: $first){nodes{id,aliases,description,htmlUrl,managedAliases,name,note,owner{... on Team{teamAlias:alias,id}},parent{id,aliases,description,htmlUrl,managedAliases,name,note,owner{... on Team{teamAlias:alias,id}}}},{{ template "pagination_request" }}}}}`,
 		`{ "after": "", "first": 100 }`,
 		`{"data":{"account":{ "systems":{ "nodes":[{{ template "system1_response" }}] } }}}`,
 	)
@@ -30,7 +30,7 @@ func TestCache(t *testing.T) {
 		`{"data":{"account":{ "teams":{ "nodes":[{{ template "team_1" }}] } }}}`,
 	)
 	testRequestFive := autopilot.NewTestRequest(
-		`query CategoryList($after:String!$first:Int!){account{rubric{categories(after: $after, first: $first){nodes{id,name},{{ template "pagination_request" }},totalCount}}}}`,
+		`query CategoryList($after:String!$first:Int!){account{rubric{categories(after: $after, first: $first){nodes{description,id,name},{{ template "pagination_request" }},totalCount}}}}`,
 		`{ "after": "", "first": 100 }`,
 		`{"data":{"account":{"rubric":{ "categories":{ "nodes":[{{ template "category_1" }}] } }}}}`,
 	)
@@ -40,7 +40,7 @@ func TestCache(t *testing.T) {
 		`{"data":{"account":{"rubric":{ "levels":{ "nodes":[{{ template "level_1" }}] } }}}}`,
 	)
 	testRequestSeven := autopilot.NewTestRequest(
-		`query FilterList($after:String!$first:Int!){account{filters(after: $after, first: $first){nodes{id,name,connective,htmlUrl,predicates{key,keyData,type,value,caseSensitive}},{{ template "pagination_request" }},totalCount}}}`,
+		`query FilterList($after:String!$first:Int!){account{filters(after: $after, first: $first){nodes{id,name,connective,htmlUrl,predicates{caseSensitive,key,keyData,type,value}},{{ template "pagination_request" }},totalCount}}}`,
 		`{ "after": "", "first": 100 }`,
 		`{"data":{"account":{ "filters":{ "nodes":[{{ template "filter_1" }}] } }}}`,
 	)

diff --git a/category.go b/category.go
@@ -7,11 +7,6 @@ import (
 	"github.com/hasura/go-graphql-client"
 )
 
-type Category struct {
-	Id   ID `json:"id"`
-	Name string
-}
-
 type CategoryConnection struct {
 	Nodes      []Category
 	PageInfo   PageInfo
@@ -26,7 +21,7 @@ func (client *Client) CreateCategory(input CategoryCreateInput) (*Category, erro
 	var m struct {
 		Payload struct {
 			Category Category
-			Errors   []OpsLevelErrors
+			Errors   []Error
 		} `graphql:"categoryCreate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -86,7 +81,7 @@ func (client *Client) UpdateCategory(input CategoryUpdateInput) (*Category, erro
 	var m struct {
 		Payload struct {
 			Category Category
-			Errors   []OpsLevelErrors
+			Errors   []Error
 		} `graphql:"categoryUpdate(input: $input)"`
 	}
 	v := PayloadVariables{
@@ -100,7 +95,7 @@ func (client *Client) DeleteCategory(id ID) error {
 	var m struct {
 		Payload struct {
 			Id     ID `graphql:"deletedCategoryId"`
-			Errors []OpsLevelErrors
+			Errors []Error
 		} `graphql:"categoryDelete(input: $input)"`
 	}
 	v := PayloadVariables{