data science ocpu count defaulting to 4

oracle-devrel · Aug 4, 2023 · d4b44a9 · d4b44a9
1 parent aad057e
commit d4b44a9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/dev/terraform/datascience.tf b/dev/terraform/datascience.tf
@@ -36,7 +36,7 @@ data "oci_datascience_notebook_session_shapes" "ds_shapes" {
   compartment_id = var.compartment_ocid
   filter {
     name   = "core_count"
-    values = [1]
+    values = [var.desired_number_cpus]
   }
 }
 

diff --git a/dev/terraform/provider.tf b/dev/terraform/provider.tf
@@ -43,6 +43,11 @@ variable "riotgames_api_key" {
   type = string
 }
 
+variable "desired_number_cpus" {
+  type    = string
+  default = 4
+}
+
 variable "create_iam_policy" {
   type    = bool
   default = true

diff --git a/dev/terraform/terraform.tfvars.template b/dev/terraform/terraform.tfvars.template
@@ -2,5 +2,6 @@ config_file_profile    = "DEFAULT"
 region                 = "REGION_NAME"
 tenancy_ocid           = "TENANCY_OCID"
 compartment_ocid       = "COMPARTMENT_OCID"
-ssh_public_key         = "SSH_PUBLIC_KEY"
-riotgames_api_key      = "RIOT_GAMES_API_KEY" # https://developer.riotgames.com/
+desired_number_cpus    = "DESIRED_NUMBER_CPU"
+riotgames_api_key      = "RIOT_GAMES_API_KEY" # https://developer.riotgames.com/
+ssh_public_key         = "SSH_PUBLIC_KEY"
diff --git a/scripts/setenv.mjs b/scripts/setenv.mjs
@@ -55,6 +55,14 @@ const compartmentId = await searchCompartmentIdByName(
 properties = { ...properties, compartmentId };
 await writeEnvJson(properties);
 
+const desiredNumberCPUs = await setVariableFromEnvOrPrompt(
+  "LOL_NUMBER_CPU",
+  "Data Science CPU number"
+);
+
+properties = { ...properties, desiredNumberCPUs: desiredNumberCPUs || 4 };
+await writeEnvJson(properties);
+
 const defaultSSHPublicKeyPath = path.join(os.homedir(), ".ssh", "id_rsa.pub");
 const publicSSHKeyExists = await fs.pathExists(defaultSSHPublicKeyPath);
 

diff --git a/scripts/tfvars.mjs b/scripts/tfvars.mjs
@@ -6,8 +6,14 @@ const shell = process.env.SHELL | "/bin/zsh";
 $.shell = shell;
 $.verbose = false;
 
-const { tenancyId, regionName, compartmentId, riotGamesApiKey, sshPublicKey } =
-  await readEnvJson();
+const {
+  tenancyId,
+  regionName,
+  compartmentId,
+  riotGamesApiKey,
+  desiredNumberCPUs,
+  sshPublicKey,
+} = await readEnvJson();
 
 const sshPublicKeyEscaped = sshPublicKey.replaceAll("/", "\\/");
 const replaceCmdSSHPublicKey = `s/SSH_PUBLIC_KEY/${sshPublicKeyEscaped}/`;
@@ -17,8 +23,9 @@ try {
     await $`sed 's/REGION_NAME/${regionName}/' dev/terraform/terraform.tfvars.template \
                    | sed 's/TENANCY_OCID/${tenancyId}/' \
                    | sed 's/COMPARTMENT_OCID/${compartmentId}/' \
-                   | sed ${replaceCmdSSHPublicKey} \
-                   | sed 's/RIOT_GAMES_API_KEY/${riotGamesApiKey}/' > dev/terraform/terraform.tfvars`;
+                   | sed 's/DESIRED_NUMBER_CPU/${desiredNumberCPUs}/' \
+                   | sed 's/RIOT_GAMES_API_KEY/${riotGamesApiKey}/' \
+                   | sed ${replaceCmdSSHPublicKey} > dev/terraform/terraform.tfvars`;
   if (exitCode !== 0) {
     exitWithError(`Error creating dev/terraform/terraform.tfvars: ${stderr}`);
   }