undo breaking change

kurtosis-tech · Nov 25, 2024 · 9820014 · 9820014
1 parent 18de25e
commit 9820014
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 75 deletions.
diff --git a/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go b/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go
diff --git a/api/golang/core/lib/enclaves/enclave_context.go b/api/golang/core/lib/enclaves/enclave_context.go
@@ -538,8 +538,8 @@ func (enclaveCtx *EnclaveContext) GetStarlarkRemotePackagePlanYaml(ctx context.C
 	}
 	response, err := enclaveCtx.client.GetStarlarkPackagePlanYaml(ctx, &kurtosis_core_rpc_api_bindings.StarlarkPackagePlanYamlArgs{
 		PackageId:              packageId,
-		IsRemote:               true,
 		SerializedParams:       &serializedParams,
+		IsRemote:               true,
 		RelativePathToMainFile: nil,
 		MainFunctionName:       nil,
 	})
@@ -573,8 +573,8 @@ func (enclaveCtx *EnclaveContext) GetStarlarkPackagePlanYaml(ctx context.Context
 
 	response, err := enclaveCtx.client.GetStarlarkPackagePlanYaml(ctx, &kurtosis_core_rpc_api_bindings.StarlarkPackagePlanYamlArgs{
 		PackageId:              packageName,
-		IsRemote:               false,
 		SerializedParams:       &serializedParams,
+		IsRemote:               false,
 		RelativePathToMainFile: nil,
 		MainFunctionName:       nil,
 	})

diff --git a/api/protobuf/core/api_container_service.proto b/api/protobuf/core/api_container_service.proto
@@ -603,12 +603,12 @@ message StarlarkScriptPlanYamlArgs {
 message StarlarkPackagePlanYamlArgs {
   string package_id = 1;
 
-  // whether or not this is package yaml should be pulled from on disk package or cloned
-  bool is_remote = 2;
-
   // Serialized parameters data for the Starlark package main function
   // This should be a valid JSON string
-  optional string serialized_params = 3;
+  optional string serialized_params = 2;
+
+  // whether or not this is package yaml should be pulled from on disk package or cloned
+  bool is_remote = 3;
 
   // The relative main file filepath, the default value is the "main.star" file in the root of a package
   optional string relative_path_to_main_file = 4;

diff --git a/api/rust/src/api_container_api.rs b/api/rust/src/api_container_api.rs
@@ -715,13 +715,13 @@ pub struct StarlarkScriptPlanYamlArgs {
 pub struct StarlarkPackagePlanYamlArgs {
     #[prost(string, tag = "1")]
     pub package_id: ::prost::alloc::string::String,
-    /// whether or not this is package yaml should be pulled from on disk package or cloned
-    #[prost(bool, tag = "2")]
-    pub is_remote: bool,
     /// Serialized parameters data for the Starlark package main function
     /// This should be a valid JSON string
-    #[prost(string, optional, tag = "3")]
+    #[prost(string, optional, tag = "2")]
     pub serialized_params: ::core::option::Option<::prost::alloc::string::String>,
+    /// whether or not this is package yaml should be pulled from on disk package or cloned
+    #[prost(bool, tag = "3")]
+    pub is_remote: bool,
     /// The relative main file filepath, the default value is the "main.star" file in the root of a package
     #[prost(string, optional, tag = "4")]
     pub relative_path_to_main_file: ::core::option::Option<

diff --git a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/api_container_service_pb.d.ts b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/api_container_service_pb.d.ts
@@ -1541,14 +1541,14 @@ export class StarlarkPackagePlanYamlArgs extends jspb.Message {
   getPackageId(): string;
   setPackageId(value: string): StarlarkPackagePlanYamlArgs;
 
-  getIsRemote(): boolean;
-  setIsRemote(value: boolean): StarlarkPackagePlanYamlArgs;
-
   getSerializedParams(): string;
   setSerializedParams(value: string): StarlarkPackagePlanYamlArgs;
   hasSerializedParams(): boolean;
   clearSerializedParams(): StarlarkPackagePlanYamlArgs;
 
+  getIsRemote(): boolean;
+  setIsRemote(value: boolean): StarlarkPackagePlanYamlArgs;
+
   getRelativePathToMainFile(): string;
   setRelativePathToMainFile(value: string): StarlarkPackagePlanYamlArgs;
   hasRelativePathToMainFile(): boolean;
@@ -1570,15 +1570,15 @@ export class StarlarkPackagePlanYamlArgs extends jspb.Message {
 export namespace StarlarkPackagePlanYamlArgs {
   export type AsObject = {
     packageId: string,
-    isRemote: boolean,
     serializedParams?: string,
+    isRemote: boolean,
     relativePathToMainFile?: string,
     mainFunctionName?: string,
   }
 
   export enum SerializedParamsCase { 
     _SERIALIZED_PARAMS_NOT_SET = 0,
-    SERIALIZED_PARAMS = 3,
+    SERIALIZED_PARAMS = 2,
   }
 
   export enum RelativePathToMainFileCase { 

diff --git a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/api_container_service_pb.js b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/api_container_service_pb.js
@@ -11107,8 +11107,8 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.toObject = functio
 proto.api_container_api.StarlarkPackagePlanYamlArgs.toObject = function(includeInstance, msg) {
   var f, obj = {
     packageId: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    isRemote: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
-    serializedParams: jspb.Message.getFieldWithDefault(msg, 3, ""),
+    serializedParams: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    isRemote: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
     relativePathToMainFile: jspb.Message.getFieldWithDefault(msg, 4, ""),
     mainFunctionName: jspb.Message.getFieldWithDefault(msg, 5, "")
   };
@@ -11152,13 +11152,13 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.deserializeBinaryFromReader
       msg.setPackageId(value);
       break;
     case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setIsRemote(value);
-      break;
-    case 3:
       var value = /** @type {string} */ (reader.readString());
       msg.setSerializedParams(value);
       break;
+    case 3:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setIsRemote(value);
+      break;
     case 4:
       var value = /** @type {string} */ (reader.readString());
       msg.setRelativePathToMainFile(value);
@@ -11203,16 +11203,16 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.serializeBinaryToWriter = fu
       f
     );
   }
-  f = message.getIsRemote();
-  if (f) {
-    writer.writeBool(
+  f = /** @type {string} */ (jspb.Message.getField(message, 2));
+  if (f != null) {
+    writer.writeString(
       2,
       f
     );
   }
-  f = /** @type {string} */ (jspb.Message.getField(message, 3));
-  if (f != null) {
-    writer.writeString(
+  f = message.getIsRemote();
+  if (f) {
+    writer.writeBool(
       3,
       f
     );
@@ -11253,29 +11253,11 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.setPackageId = fun
 
 
 /**
- * optional bool is_remote = 2;
- * @return {boolean}
- */
-proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.getIsRemote = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.api_container_api.StarlarkPackagePlanYamlArgs} returns this
- */
-proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.setIsRemote = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 2, value);
-};
-
-
-/**
- * optional string serialized_params = 3;
+ * optional string serialized_params = 2;
  * @return {string}
  */
 proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.getSerializedParams = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
@@ -11284,7 +11266,7 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.getSerializedParam
  * @return {!proto.api_container_api.StarlarkPackagePlanYamlArgs} returns this
  */
 proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.setSerializedParams = function(value) {
-  return jspb.Message.setField(this, 3, value);
+  return jspb.Message.setField(this, 2, value);
 };
 
 
@@ -11293,7 +11275,7 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.setSerializedParam
  * @return {!proto.api_container_api.StarlarkPackagePlanYamlArgs} returns this
  */
 proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.clearSerializedParams = function() {
-  return jspb.Message.setField(this, 3, undefined);
+  return jspb.Message.setField(this, 2, undefined);
 };
 
 
@@ -11302,7 +11284,25 @@ proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.clearSerializedPar
  * @return {boolean}
  */
 proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.hasSerializedParams = function() {
-  return jspb.Message.getField(this, 3) != null;
+  return jspb.Message.getField(this, 2) != null;
+};
+
+
+/**
+ * optional bool is_remote = 3;
+ * @return {boolean}
+ */
+proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.getIsRemote = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.api_container_api.StarlarkPackagePlanYamlArgs} returns this
+ */
+proto.api_container_api.StarlarkPackagePlanYamlArgs.prototype.setIsRemote = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 3, value);
 };
 
 

diff --git a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts
@@ -1907,19 +1907,19 @@ export declare class StarlarkPackagePlanYamlArgs extends Message<StarlarkPackage
   packageId: string;
 
   /**
-   * whether or not this is package yaml should be pulled from on disk package or cloned
+   * Serialized parameters data for the Starlark package main function
+   * This should be a valid JSON string
    *
-   * @generated from field: bool is_remote = 2;
+   * @generated from field: optional string serialized_params = 2;
    */
-  isRemote: boolean;
+  serializedParams?: string;
 
   /**
-   * Serialized parameters data for the Starlark package main function
-   * This should be a valid JSON string
+   * whether or not this is package yaml should be pulled from on disk package or cloned
    *
-   * @generated from field: optional string serialized_params = 3;
+   * @generated from field: bool is_remote = 3;
    */
-  serializedParams?: string;
+  isRemote: boolean;
 
   /**
    * The relative main file filepath, the default value is the "main.star" file in the root of a package

diff --git a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.js b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.js
@@ -669,8 +669,8 @@ export const StarlarkPackagePlanYamlArgs = proto3.makeMessageType(
   "api_container_api.StarlarkPackagePlanYamlArgs",
   () => [
     { no: 1, name: "package_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 2, name: "is_remote", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
-    { no: 3, name: "serialized_params", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 2, name: "serialized_params", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 3, name: "is_remote", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
     { no: 4, name: "relative_path_to_main_file", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 5, name: "main_function_name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
   ],