6593 improve usability of deploy new script

java/clients/src/main/java/sleeper/clients/admin/properties/AdminClientPropertiesStore.java

@@ -23,7 +23,6 @@
 import sleeper.clients.deploy.container.DockerImageConfiguration;
 import sleeper.clients.deploy.container.UploadDockerImagesToEcr;
 import sleeper.clients.deploy.container.UploadDockerImagesToEcrRequest;
-import sleeper.clients.util.ClientUtils;
 import sleeper.clients.util.cdk.CdkCommand;
 import sleeper.clients.util.cdk.InvokeCdk;
 import sleeper.clients.util.console.ConsoleOutput;
@@ -38,6 +37,7 @@
 import sleeper.core.properties.table.TablePropertiesStore;
 import sleeper.core.statestore.StateStore;
 import sleeper.core.table.TableIndex;
+import sleeper.core.util.FilesUtil;
 import sleeper.statestore.StateStoreFactory;
 
 import java.io.IOException;
@@ -305,7 +305,7 @@ public void saveInstanceProperties(InstanceProperties instanceProperties) {
         @Override
         public void saveLocalProperties(InstanceProperties instanceProperties, Stream<TableProperties> tablePropertiesStream) throws IOException {
             Files.createDirectories(localDirectory);
-            ClientUtils.clearDirectory(localDirectory);
+            FilesUtil.clearDirectory(localDirectory);
             SaveLocalProperties.saveToDirectory(localDirectory, instanceProperties, tablePropertiesStream);
         }
 

java/clients/src/main/java/sleeper/clients/deploy/DeployExistingInstance.java

@@ -31,6 +31,7 @@
 import sleeper.configuration.properties.S3TableProperties;
 import sleeper.core.deploy.SleeperInstanceConfiguration;
 import sleeper.core.properties.instance.InstanceProperties;
+import sleeper.core.properties.local.SaveLocalProperties;
 import sleeper.core.properties.model.SleeperInternalCdkApp;
 import sleeper.core.properties.table.TableProperties;
 import sleeper.core.util.cli.CommandArguments;
@@ -53,13 +54,15 @@ public class DeployExistingInstance {
     private final List<TableProperties> tablePropertiesList;
     private final boolean deployPaused;
     private final SleeperInternalCdkApp forceCdkApp;
+    private final Path configDir;
 
     private DeployExistingInstance(Builder builder) {
         deployInstance = builder.deployInstance;
         properties = builder.properties;
         tablePropertiesList = builder.tablePropertiesList;
         deployPaused = builder.deployPaused;
         forceCdkApp = builder.forceCdkApp;
+        configDir = builder.configDir;
     }
 
     public static Builder builder() {
@@ -107,6 +110,7 @@ public static void main(String[] rawArgs) throws IOException, InterruptedExcepti
                     .deployPaused(args.deployPaused())
                     .forceCdkApp(args.forceCdkApp())
                     .loadPropertiesFromS3(accountName, s3Client, dynamoClient)
+                    .configDir(args.scriptsDirectory().resolve("generated"))
                     .build().update();
         }
     }
@@ -115,9 +119,11 @@ public record Arguments(Path scriptsDirectory, String instanceId, boolean deploy
     }
 
     public void update() throws IOException, InterruptedException {
+        SaveLocalProperties.createDirectoryAndSaveProperties(configDir, properties, tablePropertiesList.stream());
+        CdkCommand cdkCommand = deployPaused ? CdkCommand.deployExistingPaused() : CdkCommand.deployExisting();
         deployInstance.deploy(DeployInstanceRequest.builder()
                 .instanceConfig(SleeperInstanceConfiguration.builder().instanceProperties(properties).tableProperties(tablePropertiesList).build())
-                .cdkCommand(deployPaused ? CdkCommand.deployExistingPaused() : CdkCommand.deployExisting())
+                .cdkCommand(cdkCommand.withConfigurationDirectory(configDir))
                 .cdkApp(getCdkApp())
                 .build());
 
@@ -143,6 +149,7 @@ public static final class Builder {
         private List<TableProperties> tablePropertiesList;
         private boolean deployPaused;
         private SleeperInternalCdkApp forceCdkApp;
+        private Path configDir;
 
         private Builder() {
         }
@@ -181,6 +188,11 @@ public Builder forceCdkApp(SleeperInternalCdkApp forceCdkApp) {
             return this;
         }
 
+        public Builder configDir(Path configDir) {
+            this.configDir = configDir;
+            return this;
+        }
+
         public Builder loadPropertiesFromS3(String accountName, S3Client s3Client, DynamoDbClient dynamoCient) {
             properties = S3InstanceProperties.loadGivenAccountAndInstanceId(s3Client, accountName, instanceId);
             tablePropertiesList = S3TableProperties.createStore(properties, s3Client, dynamoCient)

java/clients/src/main/java/sleeper/clients/deploy/DeployInstance.java

@@ -28,15 +28,12 @@
 import sleeper.clients.deploy.container.UploadDockerImagesToEcrRequest;
 import sleeper.clients.deploy.jar.SyncJars;
 import sleeper.clients.deploy.jar.SyncJarsRequest;
-import sleeper.clients.util.ClientUtils;
 import sleeper.clients.util.cdk.CdkCommand;
 import sleeper.clients.util.cdk.InvokeCdk;
 import sleeper.core.deploy.SleeperInstanceConfiguration;
 import sleeper.core.properties.instance.InstanceProperties;
-import sleeper.core.properties.local.SaveLocalProperties;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 
 import static sleeper.core.properties.instance.CommonProperty.ARTEFACTS_DEPLOYMENT_ID;
@@ -45,18 +42,16 @@
 import static sleeper.core.properties.instance.CommonProperty.VPC_ID;
 import static sleeper.core.properties.model.SleeperInternalCdkApp.ARTEFACTS;
 
-public class DeployInstance {
+public class DeployInstance implements InstanceDeployer {
     public static final Logger LOGGER = LoggerFactory.getLogger(DeployInstance.class);
 
     private final SyncJars syncJars;
     private final UploadDockerImagesToEcr dockerImageUploader;
-    private final WriteLocalProperties writeLocalProperties;
     private final InvokeCdk invokeCdk;
 
-    public DeployInstance(SyncJars syncJars, UploadDockerImagesToEcr dockerImageUploader, WriteLocalProperties writeLocalProperties, InvokeCdk invokeCdk) {
+    public DeployInstance(SyncJars syncJars, UploadDockerImagesToEcr dockerImageUploader, InvokeCdk invokeCdk) {
         this.syncJars = syncJars;
         this.dockerImageUploader = dockerImageUploader;
-        this.writeLocalProperties = writeLocalProperties;
         this.invokeCdk = invokeCdk;
     }
 
@@ -67,7 +62,6 @@ public static DeployInstance fromScriptsDirectory(
                 new UploadDockerImagesToEcr(
                         UploadDockerImages.fromScriptsDirectory(scriptsDirectory, ecrClient),
                         account, region, partitionMetadata),
-                DeployInstance.WriteLocalProperties.underScriptsDirectory(scriptsDirectory),
                 InvokeCdk.fromScriptsDirectory(scriptsDirectory));
     }
 
@@ -87,30 +81,9 @@ public void deploy(DeployInstanceRequest request) throws IOException, Interrupte
         syncJars.sync(SyncJarsRequest.from(instanceProperties));
         dockerImageUploader.upload(
                 UploadDockerImagesToEcrRequest.forDeployment(instanceProperties, request.getCdkApp(), DockerImageConfiguration.getDefault()));
-        Path configurationDirectory = writeLocalProperties.write(instanceConfig);
         LOGGER.info("-------------------------------------------------------");
         LOGGER.info("Deploying Stacks");
         LOGGER.info("-------------------------------------------------------");
-        invokeCdk.invoke(request.getCdkApp(), request.getCdkCommand().withConfigurationDirectory(configurationDirectory));
-    }
-
-    public interface WriteLocalProperties {
-        Path write(SleeperInstanceConfiguration instanceConfig) throws IOException;
-
-        static WriteLocalProperties underScriptsDirectory(Path scriptsDirectory) {
-            return toDirectory(scriptsDirectory.resolve("generated"));
-        }
-
-        static WriteLocalProperties toDirectory(Path directory) {
-            return instanceConfig -> {
-                LOGGER.info("Writing instance configuration to local directory: {}", directory);
-                Files.createDirectories(directory);
-                ClientUtils.clearDirectory(directory);
-                SaveLocalProperties.saveToDirectory(directory,
-                        instanceConfig.getInstanceProperties(),
-                        instanceConfig.getTableProperties().stream());
-                return directory;
-            };
-        }
+        invokeCdk.invoke(request.getCdkApp(), request.getCdkCommand());
     }
 }

java/clients/src/main/java/sleeper/clients/deploy/DeployInstanceRequest.java

@@ -49,6 +49,26 @@ public CdkCommand getCdkCommand() {
         return cdkCommand;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DeployInstanceRequest instanceRequest = (DeployInstanceRequest) o;
+
+        return Objects.equals(instanceConfig, instanceRequest.instanceConfig) &&
+                Objects.equals(cdkCommand, instanceRequest.cdkCommand) &&
+                Objects.equals(cdkApp, instanceRequest.cdkApp);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(instanceConfig, cdkCommand, cdkApp);
+    }
+
     public static class Builder {
         private SleeperInstanceConfiguration instanceConfig;
         private CdkCommand cdkCommand;