Update Restate Server to v1.4.0 (#78)

Author: pcholakov

lib/restate-constructs/fargate-restate-deployment.ts

@@ -27,8 +27,8 @@ const PUBLIC_INGRESS_PORT = 443;
 const PUBLIC_ADMIN_PORT = 9070;
 const RESTATE_INGRESS_PORT = 8080;
 const RESTATE_ADMIN_PORT = 9070;
-const RESTATE_IMAGE_DEFAULT = "docker.io/restatedev/restate";
-const RESTATE_DOCKER_DEFAULT_TAG = "latest";
+const RESTATE_IMAGE_DEFAULT = "docker.restate.dev/restatedev/restate";
+const RESTATE_DOCKER_DEFAULT_TAG = "1.4";
 const ADOT_DOCKER_DEFAULT_TAG = "latest";
 
 export interface RestateFargateProps {

lib/restate-constructs/single-node-restate-deployment.ts

@@ -65,6 +65,9 @@ export interface SingleNodeRestateProps {
   /** Restate Docker image tag. Defaults to `latest`. */
   restateTag?: string;
 
+  /** Restate NPM tools tag (used for `restate`/`restatectl`). Defaults to `latest`. */
+  restateNpmTag?: string;
+
   /**
    * EBS data volume settings for Restate data storage. If not specified, a default 8GB volume will be created.
    */
@@ -142,8 +145,9 @@ const RESTATE_INGRESS_PORT = 8080;
 const RESTATE_TLS_INGRESS_PORT = 443;
 const RESTATE_ADMIN_PORT = 9070;
 const RESTATE_TLS_ADMIN_PORT = 9073;
-const RESTATE_IMAGE_DEFAULT = "docker.io/restatedev/restate";
-const RESTATE_DOCKER_DEFAULT_TAG = "latest";
+const RESTATE_IMAGE_DEFAULT = "docker.restate.dev/restatedev/restate";
+const RESTATE_DOCKER_DEFAULT_TAG = "1.4";
+const RESTATE_NPM_DEFAULT_TAG = "1.4";
 const ADOT_DOCKER_DEFAULT_TAG = "latest";
 const DATA_DEVICE_NAME = "/dev/sdd";
 
@@ -213,8 +217,30 @@ export class SingleNodeRestateDeployment extends Construct implements IRestateEn
       });
     logGroup.grantWrite(this.instanceRole);
 
-    const restateImage = props.restateImage ?? RESTATE_IMAGE_DEFAULT;
-    const restateTag = props.restateTag ?? RESTATE_DOCKER_DEFAULT_TAG;
+    let restateImage = props.restateImage ?? RESTATE_IMAGE_DEFAULT;
+    let restateDockerTag = props.restateTag ?? RESTATE_DOCKER_DEFAULT_TAG;
+    let restateNpmTag = props.restateNpmTag ?? RESTATE_NPM_DEFAULT_TAG;
+    let useShaDigest = false;
+    let shaDigest = "";
+
+    if (restateImage.includes("@")) {
+      const parts = restateImage.split("@");
+      restateImage = parts[0];
+      shaDigest = parts[1];
+      useShaDigest = true;
+    } else if (restateImage.includes(":")) {
+      const parts = restateImage.split(":");
+      restateImage = parts[0];
+      const inlineTag = parts[1];
+
+      if (props.restateTag && props.restateTag !== inlineTag) {
+        throw new Error(
+          `Tag conflict: inline tag '${inlineTag}' in image doesn't match explicit tag '${props.restateTag}' property`,
+        );
+      }
+
+      restateDockerTag = inlineTag;
+    }
     const adotTag = props.adotTag ?? ADOT_DOCKER_DEFAULT_TAG;
 
     this.tlsEnabled = props.tlsTermination === TlsTermination.ON_HOST_SELF_SIGNED_CERTIFICATE;
@@ -231,7 +257,7 @@ export class SingleNodeRestateDeployment extends Construct implements IRestateEn
     const initScript = ec2.UserData.forLinux();
     initScript.addCommands(
       "set -euf -o pipefail",
-      `yum install -y npm && npm install -gq @restatedev/restate@${restateTag} @restatedev/restatectl@${restateTag}`,
+      `yum install -y npm && npm install -gq @restatedev/restate@${restateNpmTag} @restatedev/restatectl@${restateNpmTag}`,
       "yum install -y docker",
       this.mountDataVolumeScript(),
 
@@ -254,7 +280,7 @@ export class SingleNodeRestateDeployment extends Construct implements IRestateEn
         " --network=host" +
         ` ${envArgs}` +
         ` --log-driver=awslogs --log-opt awslogs-group=${logGroup.logGroupName}` +
-        ` ${restateImage}:${restateTag}` +
+        ` ${useShaDigest ? `${restateImage}@${shaDigest}` : `${restateImage}:${restateDockerTag}`}` +
         " --config-file /etc/restate/config.toml",
     );
 
@@ -358,6 +384,7 @@ export class SingleNodeRestateDeployment extends Construct implements IRestateEn
         `    "admin",`,
         `    "metadata-server",`,
         `    "log-server",`,
+        `    "http-ingress",`,
         `]`,
         `node-name = "restate-0"`,
         `cluster-name = "${props.restateConfig?.clusterName ?? id}"`,