Skip to content

Commit

Permalink
feat: create_compute_hyperdisk (#3795)
Browse files Browse the repository at this point in the history
* feat: create_compute_hyperdisk

* refactor: remove chai module

* Revert chai module

* Downgrade chai module

* Fix tests

* Revert the changes

* Changed debian-10 -> debian-11
  • Loading branch information
gryczj authored Aug 22, 2024
1 parent 79969c5 commit 1cf0c61
Show file tree
Hide file tree
Showing 13 changed files with 182 additions and 17 deletions.
6 changes: 3 additions & 3 deletions compute/createInstance.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* https://cloud.google.com/sdk/gcloud/reference/compute/machine-types/list
* @param {string} sourceImage - Path the the disk image you want to use for your boot
* disk. This can be one of the public images
* (e.g. "projects/debian-cloud/global/images/family/debian-10")
* (e.g. "projects/debian-cloud/global/images/family/debian-11")
* or a private image you have access to.
* You can check the list of available public images using:
* $ gcloud compute images list
Expand All @@ -37,7 +37,7 @@ function main(
zone,
instanceName,
machineType = 'n1-standard-1',
sourceImage = 'projects/debian-cloud/global/images/family/debian-10',
sourceImage = 'projects/debian-cloud/global/images/family/debian-11',
networkName = 'global/networks/default'
) {
// [START compute_instances_create]
Expand All @@ -48,7 +48,7 @@ function main(
// const zone = 'europe-central2-b'
// const instanceName = 'YOUR_INSTANCE_NAME'
// const machineType = 'n1-standard-1';
// const sourceImage = 'projects/debian-cloud/global/images/family/debian-10';
// const sourceImage = 'projects/debian-cloud/global/images/family/debian-11';
// const networkName = 'global/networks/default';

const compute = require('@google-cloud/compute');
Expand Down
6 changes: 3 additions & 3 deletions compute/createInstanceFromTemplateWithOverrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* https://cloud.google.com/sdk/gcloud/reference/compute/machine-types/list
* @param {string} newDiskSourceImage - Path the the disk image you want to use for your new
* disk. This can be one of the public images
* (like "projects/debian-cloud/global/images/family/debian-10")
* (like "projects/debian-cloud/global/images/family/debian-11")
* or a private image you have access to.
* For a list of available public images, see the documentation:
* http://cloud.google.com/compute/docs/images
Expand All @@ -37,7 +37,7 @@ function main(
instanceName,
instanceTemplateName,
machineType = 'n1-standard-2',
newDiskSourceImage = 'projects/debian-cloud/global/images/family/debian-10'
newDiskSourceImage = 'projects/debian-cloud/global/images/family/debian-11'
) {
// [START compute_instances_create_from_template_with_overrides]
/**
Expand All @@ -48,7 +48,7 @@ function main(
// const instanceName = 'YOUR_INSTANCE_NAME';
// const instanceTemplateName = 'YOUR_INSTANCE_TEMPLATE_NAME';
// const machineType = 'n1-standard-1';
// const newDiskSourceImage = 'projects/debian-cloud/global/images/family/debian-10';
// const newDiskSourceImage = 'projects/debian-cloud/global/images/family/debian-11';

const compute = require('@google-cloud/compute');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function main(
instanceName,
hostname,
machineType = 'n1-standard-1',
sourceImage = 'projects/debian-cloud/global/images/family/debian-10',
sourceImage = 'projects/debian-cloud/global/images/family/debian-11',
networkName = 'global/networks/default'
) {
// [START compute_instances_create_custom_hostname]
Expand All @@ -52,7 +52,7 @@ function main(
// const instanceName = 'YOUR_INSTANCE_NAME'
// const hostname = 'host.example.com'
// const machineType = 'n1-standard-1';
// const sourceImage = 'projects/debian-cloud/global/images/family/debian-10';
// const sourceImage = 'projects/debian-cloud/global/images/family/debian-11';
// const networkName = 'global/networks/default';

const compute = require('@google-cloud/compute');
Expand Down
99 changes: 99 additions & 0 deletions compute/disks/createComputeHyperdisk.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';

async function main() {
// [START compute_hyperdisk_create]
// Import the Compute library
const computeLib = require('@google-cloud/compute');
const compute = computeLib.protos.google.cloud.compute.v1;

// Instantiate a diskClient
const disksClient = new computeLib.DisksClient();
// Instantiate a zoneOperationsClient
const zoneOperationsClient = new computeLib.ZoneOperationsClient();

/**
* TODO(developer): Update these variables before running the sample.
*/
// Project ID or project number of the Google Cloud project you want to use.
const projectId = await disksClient.getProjectId();
// The zone where your VM and new disk are located.
const zone = 'europe-central2-b';
// The name of the new disk
const diskName = 'disk-name';
// The type of disk. This value uses the following format:
// "zones/{zone}/diskTypes/(hyperdisk-balanced|hyperdisk-extreme|hyperdisk-ml|hyperdisk-throughput)".
// For example: "zones/us-west3-b/diskTypes/hyperdisk-balanced"
const diskType = `zones/${zone}/diskTypes/hyperdisk-balanced`;
// Size of the new disk in gigabytes.
const diskSizeGb = 10;
// Optional: For Hyperdisk Balanced or Hyperdisk Extreme disks,
// this is the number of I/O operations per second (IOPS) that the disk can handle.
const provisionedIops = 3000;
// Optional: For Hyperdisk Balanced or Hyperdisk Throughput volumes,
// this is an integer that represents the throughput,
// measured in MiB per second, that the disk can handle.
const provisionedThroughput = 140;

async function callCreateComputeHyperdisk() {
// Create a disk
const disk = new compute.Disk({
sizeGb: diskSizeGb,
name: diskName,
zone,
type: diskType,
provisionedIops,
provisionedThroughput,
});

const [response] = await disksClient.insert({
project: projectId,
zone,
diskResource: disk,
});

let operation = response.latestResponse;

// Wait for the create disk operation to complete.
while (operation.status !== 'DONE') {
[operation] = await zoneOperationsClient.wait({
operation: operation.name,
project: projectId,
zone: operation.zone.split('/').pop(),
});
}

const hyperdisk = (
await disksClient.get({
project: projectId,
zone,
disk: diskName,
})
)[0];

console.log(JSON.stringify(hyperdisk));
}

await callCreateComputeHyperdisk();
// [END compute_hyperdisk_create]
}

main().catch(err => {
console.error(err);
process.exitCode = 1;
});
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function main(projectId, zone, instanceName) {
// List of public operating system (OS) images: https://cloud.google.com/compute/docs/images/os-details.
const [newestDebian] = await imagesClient.getFromFamily({
project: 'debian-cloud',
family: 'debian-10',
family: 'debian-11',
});

const [response] = await instancesClient.insert({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function main(
// List of public operating system (OS) images: https://cloud.google.com/compute/docs/images/os-details.
const [newestDebian] = await imagesClient.getFromFamily({
project: 'debian-cloud',
family: 'debian-10',
family: 'debian-11',
});

const [response] = await instancesClient.insert({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function main(projectId, zone, instanceName, deleteProtection) {
initializeParams: {
diskSizeGb: '10',
sourceImage:
'projects/debian-cloud/global/images/family/debian-10',
'projects/debian-cloud/global/images/family/debian-11',
},
autoDelete: true,
boot: true,
Expand Down
52 changes: 52 additions & 0 deletions compute/test/createComputeHyperdisk.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';

const path = require('path');
const {assert} = require('chai');
const {describe, it} = require('mocha');
const cp = require('child_process');
const {DisksClient} = require('@google-cloud/compute').v1;
const {deleteDisk} = require('./util');

const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
const cwd = path.join(__dirname, '..');

describe('Create compute hyperdisk', async () => {
const diskName = 'disk-name';
const zone = 'europe-central2-b';
const disksClient = new DisksClient();
let projectId;

before(async () => {
projectId = await disksClient.getProjectId();
});

after(async () => {
await deleteDisk(disksClient, projectId, zone, diskName);
});

it('should create a new hyperdisk', () => {
const response = JSON.parse(
execSync('node ./disks/createComputeHyperdisk.js', {
cwd,
})
);

assert.equal(response.name, diskName);
});
});
2 changes: 1 addition & 1 deletion compute/test/createInstanceTemplates.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const createInstance = async (projectId, zone, instanceName) => {
{
initializeParams: {
diskSizeGb: '250',
sourceImage: 'projects/debian-cloud/global/images/family/debian-10',
sourceImage: 'projects/debian-cloud/global/images/family/debian-11',
},
autoDelete: true,
boot: true,
Expand Down
4 changes: 2 additions & 2 deletions compute/test/createStartInstance.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe('create start instance tests', () => {

const [newestDebian] = await imagesClient.getFromFamily({
project: 'debian-cloud',
family: 'debian-10',
family: 'debian-11',
});

await createDisk(projectId, zone, diskName, newestDebian.selfLink);
Expand Down Expand Up @@ -163,7 +163,7 @@ describe('create start instance tests', () => {

const [newestDebian] = await imagesClient.getFromFamily({
project: 'debian-cloud',
family: 'debian-10',
family: 'debian-11',
});

let output;
Expand Down
4 changes: 2 additions & 2 deletions compute/test/samples.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ describe('samples', () => {
initializeParams: {
diskSizeGb: '10',
sourceImage:
'projects/debian-cloud/global/images/family/debian-10',
'projects/debian-cloud/global/images/family/debian-11',
},
autoDelete: true,
boot: true,
Expand Down Expand Up @@ -447,7 +447,7 @@ describe('samples', () => {
initializeParams: {
diskSizeGb: '10',
sourceImage:
'projects/debian-cloud/global/images/family/debian-10',
'projects/debian-cloud/global/images/family/debian-11',
},
autoDelete: true,
boot: true,
Expand Down
14 changes: 14 additions & 0 deletions compute/test/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,22 @@ async function deleteInstance(zone, instanceName) {
}
}

async function deleteDisk(disksClient, projectId, zone, diskName) {
try {
await disksClient.delete({
project: projectId,
disk: diskName,
zone,
});
} catch (err) {
console.error('Deleting disk failed: ', err);
throw new Error(err);
}
}

module.exports = {
generateTestId,
getStaleVMInstances,
deleteInstance,
deleteDisk,
};
2 changes: 1 addition & 1 deletion functions/v2/autoLabelInstance/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('functions_label_gce_instance', () => {
initializeParams: {
diskSizeGb: '10',
sourceImage:
'projects/debian-cloud/global/images/family/debian-10',
'projects/debian-cloud/global/images/family/debian-11',
},
boot: true,
autoDelete: true,
Expand Down

0 comments on commit 1cf0c61

Please sign in to comment.