syncing up to a67ab5cbb1509d09dab41b8fc2f242c3c46699a9

Co-authored-by: Carl Noel <[email protected]>

CHANGELOG.md

@@ -18,9 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix worker/js helm limits.memory
 - Update shutdown ordering so critical processes are not terminated prior to the webserver
 - Change `v1.security.Resource.config.api` type from `google.protobuf.Value` well known type back to `v1.Api`
-- Added support for enabling `restapi`, `restapiintegration`, `openapi` and `graphql` plugins to return more verbose HTTP response data in result (e.g. response status text, status code, etc.)
-- Added support for configuring whether or not a step using a `restapi`, `restapiintegration`, `openapi` or `graphql` plugin fails if the underlying web request fails
 - Update dependencies to remove critical vulnerabilities in wget and libexpat1
+- Added support for enabling `restapi`, `restapiintegration`, `openapi`, `graphql` and `graphqlintegration` plugins to return more verbose HTTP response data in result (e.g. response status text, status code, etc.)
+- Added support for configuring whether or not a step using a `restapi`, `restapiintegration` or `openapi` plugin fails if the underlying web request fails
+- Added support for configuring whether or not a step using a `graphql` or `graphqlintegration` plugin fails if the GraphQL query returns with errors
 
 ## v1.14.1
 

internal/registration/registration.go

@@ -30,7 +30,7 @@ var SUPERBLOCKS_PLUGIN_VERSIONS = map[string][]string{
 	"dynamodb":           {"0.0.7"},
 	"email":              {"0.0.7"},
 	"gcs":                {"0.0.1"},
-	"graphql":            {"0.0.9"},
+	"graphql":            {"0.0.10"},
 	"gsheets":            {"0.0.18"},
 	"kafka":              {"0.0.1"},
 	"javascript":         {"0.0.9"},

internal/registration/registration_test.go

@@ -65,5 +65,5 @@ func TestRegistrationRequest(t *testing.T) {
 	assert.Equal(t, "https://foo.bar.com/api/v1/agents/register", request.URL.String())
 	assert.Equal(t, http.MethodPost, request.Method)
 	assert.Equal(t, expectedRequestHeaders, request.Header)
-	assert.Equal(t, "{\"pluginVersions\":{\"athena\":[\"0.0.1\"],\"bigquery\":[\"0.0.7\"],\"cockroachdb\":[\"0.0.2\"],\"confluent\":[\"0.0.1\"],\"cosmosdb\":[\"0.0.1\"],\"couchbase\":[\"0.0.2\"],\"databricks\":[\"0.0.1\"],\"dynamodb\":[\"0.0.7\"],\"email\":[\"0.0.7\"],\"gcs\":[\"0.0.1\"],\"graphql\":[\"0.0.9\"],\"gsheets\":[\"0.0.18\"],\"javascript\":[\"0.0.9\"],\"kafka\":[\"0.0.1\"],\"kinesis\":[\"0.0.1\"],\"mariadb\":[\"0.0.11\"],\"mongodb\":[\"0.0.7\"],\"mssql\":[\"0.0.10\"],\"mysql\":[\"0.0.11\"],\"openai\":[\"0.0.3\"],\"oracledb\":[\"0.0.1\"],\"postgres\":[\"0.0.11\"],\"python\":[\"0.0.7\"],\"redis\":[\"0.0.1\"],\"redpanda\":[\"0.0.1\"],\"redshift\":[\"0.0.7\"],\"restapi\":[\"0.0.13\"],\"restapiintegration\":[\"0.0.14\"],\"rockset\":[\"0.0.7\"],\"s3\":[\"0.0.10\"],\"salesforce\":[\"0.0.1\"],\"smtp\":[\"0.0.1\"],\"snowflake\":[\"0.0.7\"],\"superblocks-ocr\":[\"0.0.1\"],\"workflow\":[\"0.0.4\"]},\"type\":2,\"tags\":{\"foo\":[\"bar\"]},\"signingKeyId\":\"123\",\"verificationKeyIds\":[\"123\"],\"verificationKeys\":{\"123\":\"key1\"}}\n", string(body))
+	assert.Equal(t, "{\"pluginVersions\":{\"athena\":[\"0.0.1\"],\"bigquery\":[\"0.0.7\"],\"cockroachdb\":[\"0.0.2\"],\"confluent\":[\"0.0.1\"],\"cosmosdb\":[\"0.0.1\"],\"couchbase\":[\"0.0.2\"],\"databricks\":[\"0.0.1\"],\"dynamodb\":[\"0.0.7\"],\"email\":[\"0.0.7\"],\"gcs\":[\"0.0.1\"],\"graphql\":[\"0.0.10\"],\"gsheets\":[\"0.0.18\"],\"javascript\":[\"0.0.9\"],\"kafka\":[\"0.0.1\"],\"kinesis\":[\"0.0.1\"],\"mariadb\":[\"0.0.11\"],\"mongodb\":[\"0.0.7\"],\"mssql\":[\"0.0.10\"],\"mysql\":[\"0.0.11\"],\"openai\":[\"0.0.3\"],\"oracledb\":[\"0.0.1\"],\"postgres\":[\"0.0.11\"],\"python\":[\"0.0.7\"],\"redis\":[\"0.0.1\"],\"redpanda\":[\"0.0.1\"],\"redshift\":[\"0.0.7\"],\"restapi\":[\"0.0.13\"],\"restapiintegration\":[\"0.0.14\"],\"rockset\":[\"0.0.7\"],\"s3\":[\"0.0.10\"],\"salesforce\":[\"0.0.1\"],\"smtp\":[\"0.0.1\"],\"snowflake\":[\"0.0.7\"],\"superblocks-ocr\":[\"0.0.1\"],\"workflow\":[\"0.0.4\"]},\"type\":2,\"tags\":{\"foo\":[\"bar\"]},\"signingKeyId\":\"123\",\"verificationKeyIds\":[\"123\"],\"verificationKeys\":{\"123\":\"key1\"}}\n", string(body))
 }

types/api/api/v1/service.swagger.json

@@ -3595,9 +3595,9 @@
           "type": "boolean",
           "title": "Include HTTP response metadata in output"
         },
-        "doNotFailOnRequestError": {
+        "failOnGraphqlErrors": {
           "type": "boolean",
-          "description": "Do not fail executions on failed requests (4xx/5xx). We use the negative here to ensure the default (falsy) behavior matches the existing API behavior."
+          "title": "Fail executions for GraphQL responses that contain errors"
         }
       }
     },

types/api/security/v1/service.swagger.json

@@ -2598,9 +2598,9 @@
           "type": "boolean",
           "title": "Include HTTP response metadata in output"
         },
-        "doNotFailOnRequestError": {
+        "failOnGraphqlErrors": {
           "type": "boolean",
-          "description": "Do not fail executions on failed requests (4xx/5xx). We use the negative here to ensure the default (falsy) behavior matches the existing API behavior."
+          "title": "Fail executions for GraphQL responses that contain errors"
         }
       }
     },

types/gen/js/plugins/graphql/v1/plugin_pb.d.ts

@@ -57,8 +57,8 @@ export class Plugin extends jspb.Message {
     setSuperblocksmetadata(value?: common_v1_plugin_pb.SuperblocksMetadata): Plugin;
     getVerbosehttpoutput(): boolean;
     setVerbosehttpoutput(value: boolean): Plugin;
-    getDonotfailonrequesterror(): boolean;
-    setDonotfailonrequesterror(value: boolean): Plugin;
+    getFailongraphqlerrors(): boolean;
+    setFailongraphqlerrors(value: boolean): Plugin;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): Plugin.AsObject;
@@ -78,6 +78,6 @@ export namespace Plugin {
         custom?: Custom.AsObject,
         superblocksmetadata?: common_v1_plugin_pb.SuperblocksMetadata.AsObject,
         verbosehttpoutput: boolean,
-        donotfailonrequesterror: boolean,
+        failongraphqlerrors: boolean,
     }
 }

types/gen/js/plugins/graphql/v1/plugin_pb.js

@@ -315,7 +315,7 @@ body: jspb.Message.getFieldWithDefault(msg, 3, ""),
 custom: (f = msg.getCustom()) && proto.plugins.graphql.v1.Custom.toObject(includeInstance, f),
 superblocksmetadata: (f = msg.getSuperblocksmetadata()) && common_v1_plugin_pb.SuperblocksMetadata.toObject(includeInstance, f),
 verbosehttpoutput: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
-donotfailonrequesterror: jspb.Message.getBooleanFieldWithDefault(msg, 7, false)
+failongraphqlerrors: jspb.Message.getBooleanFieldWithDefault(msg, 7, false)
   };
 
   if (includeInstance) {
@@ -381,7 +381,7 @@ proto.plugins.graphql.v1.Plugin.deserializeBinaryFromReader = function(msg, read
       break;
     case 7:
       var value = /** @type {boolean} */ (reader.readBool());
-      msg.setDonotfailonrequesterror(value);
+      msg.setFailongraphqlerrors(value);
       break;
     default:
       reader.skipField();
@@ -457,7 +457,7 @@ proto.plugins.graphql.v1.Plugin.serializeBinaryToWriter = function(message, writ
       f
     );
   }
-  f = message.getDonotfailonrequesterror();
+  f = message.getFailongraphqlerrors();
   if (f) {
     writer.writeBool(
       7,
@@ -634,10 +634,10 @@ proto.plugins.graphql.v1.Plugin.prototype.setVerbosehttpoutput = function(value)
 
 
 /**
- * optional bool doNotFailOnRequestError = 7;
+ * optional bool failOnGraphqlErrors = 7;
  * @return {boolean}
  */
-proto.plugins.graphql.v1.Plugin.prototype.getDonotfailonrequesterror = function() {
+proto.plugins.graphql.v1.Plugin.prototype.getFailongraphqlerrors = function() {
   return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 7, false));
 };
 
@@ -646,7 +646,7 @@ proto.plugins.graphql.v1.Plugin.prototype.getDonotfailonrequesterror = function(
  * @param {boolean} value
  * @return {!proto.plugins.graphql.v1.Plugin} returns this
  */
-proto.plugins.graphql.v1.Plugin.prototype.setDonotfailonrequesterror = function(value) {
+proto.plugins.graphql.v1.Plugin.prototype.setFailongraphqlerrors = function(value) {
   return jspb.Message.setProto3BooleanField(this, 7, value);
 };