From 02c6f8848271ccd540306f3e34a1e9398013d93a Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 2 May 2022 00:33:45 +0900 Subject: [PATCH 1/3] Add NCPVPC Conn-config, Build script, Test fils --- .../connect-config/14.ncpvpc-conn-config.sh | 25 +++ .../test/full-test/14.ncpvpc-test.sh | 14 ++ .../test/full-test/ncpvpc-full_test.sh | 212 ++++++++++++++++++ cloud-driver-libs/cloudos_meta.yaml | 6 +- .../2.build/ncpvpc-build.sh | 39 ++++ 5 files changed, 294 insertions(+), 2 deletions(-) create mode 100755 api-runtime/rest-runtime/test/connect-config/14.ncpvpc-conn-config.sh create mode 100755 api-runtime/rest-runtime/test/full-test/14.ncpvpc-test.sh create mode 100755 api-runtime/rest-runtime/test/full-test/ncpvpc-full_test.sh create mode 100755 utils/driver-build-docker/2.build/ncpvpc-build.sh diff --git a/api-runtime/rest-runtime/test/connect-config/14.ncpvpc-conn-config.sh b/api-runtime/rest-runtime/test/connect-config/14.ncpvpc-conn-config.sh new file mode 100755 index 000000000..caf580770 --- /dev/null +++ b/api-runtime/rest-runtime/test/connect-config/14.ncpvpc-conn-config.sh @@ -0,0 +1,25 @@ +RESTSERVER=localhost + + # Cloud Driver Info +curl -X POST http://$RESTSERVER:1024/spider/driver -H 'Content-Type: application/json' -d '{"DriverName":"ncpvpc-driver01","ProviderName":"NCPVPC", "DriverLibFileName":"ncpvpc-driver-v1.0.so"}' + + # Cloud Credential Info +curl -X POST http://$RESTSERVER:1024/spider/credential -H 'Content-Type: application/json' -d '{"CredentialName":"ncpvpc-credential01","ProviderName":"NCPVPC", "KeyValueInfoList": [{"Key":"ClientId", "Value":"XXXXXXXXXXXXXXXXXX"}, {"Key":"ClientSecret", "Value":"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"}]}' + + # Cloud Region & Zone Info +curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"ncpvpc-korea1","ProviderName":"NCPVPC", "KeyValueInfoList": [{"Key":"Region", "Value":"KR"}, {"Key":"Zone", "Value":"KR-1"}]}' + +curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"ncpvpc-korea2","ProviderName":"NCPVPC", "KeyValueInfoList": [{"Key":"Region", "Value":"KR"}, {"Key":"Zone", "Value":"KR-2"}]}' + +curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"ncpvpc-singapore4","ProviderName":"NCPVPC", "KeyValueInfoList": [{"Key":"Region", "Value":"SGN"}, {"Key":"Zone", "Value":"SGN-4"}]}' + +curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"ncpvpc-singapore5","ProviderName":"NCPVPC", "KeyValueInfoList": [{"Key":"Region", "Value":"SGN"}, {"Key":"Zone", "Value":"SGN-5"}]}' + + # Cloud Connection Config Info +curl -X POST http://$RESTSERVER:1024/spider/connectionconfig -H 'Content-Type: application/json' -d '{"ConfigName":"ncpvpc-korea1-config","ProviderName":"NCPVPC", "DriverName":"ncpvpc-driver01", "CredentialName":"ncpvpc-credential01", "RegionName":"ncpvpc-korea1"}' + +curl -X POST http://$RESTSERVER:1024/spider/connectionconfig -H 'Content-Type: application/json' -d '{"ConfigName":"ncpvpc-korea2-config","ProviderName":"NCPVPC", "DriverName":"ncpvpc-driver01", "CredentialName":"ncpvpc-credential01", "RegionName":"ncpvpc-korea2"}' + +curl -X POST http://$RESTSERVER:1024/spider/connectionconfig -H 'Content-Type: application/json' -d '{"ConfigName":"ncpvpc-singapore4-config","ProviderName":"NCPVPC", "DriverName":"ncpvpc-driver01", "CredentialName":"ncpvpc-credential01", "RegionName":"ncpvpc-singapore4"}' + +curl -X POST http://$RESTSERVER:1024/spider/connectionconfig -H 'Content-Type: application/json' -d '{"ConfigName":"ncpvpc-singapore5-config","ProviderName":"NCPVPC", "DriverName":"ncpvpc-driver01", "CredentialName":"ncpvpc-credential01", "RegionName":"ncpvpc-singapore5"}' diff --git a/api-runtime/rest-runtime/test/full-test/14.ncpvpc-test.sh b/api-runtime/rest-runtime/test/full-test/14.ncpvpc-test.sh new file mode 100755 index 000000000..b36ba3c59 --- /dev/null +++ b/api-runtime/rest-runtime/test/full-test/14.ncpvpc-test.sh @@ -0,0 +1,14 @@ +export CONN_CONFIG=ncpvpc-korea1-config +#export CONN_CONFIG=ncpvpc-korea2-config +#export CONN_CONFIG=ncpvpc-singapore4-config +#export CONN_CONFIG=ncpvpc-singapore5-config + +# Ubuntu 18.04 image(for Korea1) +export IMAGE_NAME=SW.VSVR.OS.LNX64.UBNTU.SVR1804.B050 +# singapore4-config도 지원 + +# vCPU: 4, Mem: 8192MB +export SPEC_NAME=SVR.VSVR.HICPU.C004.M008.NET.SSD.B050.G002 +# singapore4-config도 지원 + +./ncpvpc-full_test.sh diff --git a/api-runtime/rest-runtime/test/full-test/ncpvpc-full_test.sh b/api-runtime/rest-runtime/test/full-test/ncpvpc-full_test.sh new file mode 100755 index 000000000..7a42441c3 --- /dev/null +++ b/api-runtime/rest-runtime/test/full-test/ncpvpc-full_test.sh @@ -0,0 +1,212 @@ +echo "#### Full Test Process - Start ###" + +sleep 1 +echo "####################################################################" +echo "## Full Test Scripts for CB-Spider IID Working Version - 2020.04.22." +echo "## 0. VM Image: List" +echo "## 0. VM Spec: List" +echo "## 1. VPC: Create -> List -> Get" +echo "## 2. SecurityGroup: Create -> List -> Get" +echo "## 3. KeyPair: Create -> List -> Get" +echo "## 4. VM: StartVM -> List -> Get -> ListStatus -> GetStatus -> Suspend -> Resume -> Reboot" +echo "## ---------------------------------" +echo "## 4. VM: Terminate(Delete)" +echo "## 3. KeyPair: Delete" +echo "## 2. SecurityGroup: Delete" +echo "## 1. VPC: Delete" +echo "####################################################################" + +sleep 2 + +echo "## 0. VM Image: List" +curl -sX GET http://localhost:1024/spider/vmimage -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 + +echo "## 0. VM Image: Get" +curl -sX GET http://localhost:1024/spider/vmimage/${IMAGE_NAME} -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 + +echo "## 0. VM Spec: List" +curl -sX GET http://localhost:1024/spider/vmspec -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 + +echo "## 0. VM Spec: Get" +curl -sX GET http://localhost:1024/spider/vmspec/${SPEC_NAME} -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp +echo "#-----------------------------" + +sleep 5 + +echo "####################################################################" +echo "## 1. VPC: Create -> List -> Get" +echo "####################################################################" +sleep 1 +echo "## 1. VPC: Create" +curl -sX POST http://localhost:1024/spider/vpc -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-vpc-01", "IPv4_CIDR": "172.16.0.0/16", "SubnetInfoList": [ { "Name": "ncp-subnet-01", "IPv4_CIDR": "172.16.0.0/24"}, { "Name": "ncp-subnet-02", "IPv4_CIDR": "172.16.1.0/24"} ] } }' |json_pp + +sleep 5 +echo "## 1. VPC: List" +curl -sX GET http://localhost:1024/spider/vpc -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 +echo "## 1. VPC: Get" +curl -sX GET http://localhost:1024/spider/vpc/ncp-vpc-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp +echo "#-----------------------------" + +echo "####################################################################" +echo "## 2. SecurityGroup: Create -> List -> Get" +echo "####################################################################" + +sleep 1 +echo "## 2. SecurityGroup: Create" +curl -sX POST http://localhost:1024/spider/securitygroup -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-sg-01", "VPCName": "ncp-vpc-01", "SecurityRules": [ {"FromPort": "22", "ToPort" : "22", "IPProtocol" : "tcp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"} ] } }' |json_pp + +sleep 5 + +curl -sX POST http://localhost:1024/spider/securitygroup -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-sg-02", "VPCName": "ncp-vpc-01", "SecurityRules": [ {"FromPort": "1", "ToPort" : "65535", "IPProtocol" : "tcp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"}, {"FromPort": "-1", "ToPort" : "-1", "IPProtocol" : "udp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"}, {"FromPort": "-1", "ToPort" : "-1", "IPProtocol" : "icmp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"} ] } }' |json_pp + +sleep 5 + +curl -sX POST http://localhost:1024/spider/securitygroup -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-sg-03", "VPCName": "ncp-vpc-01", "SecurityRules": [ {"FromPort": "22", "ToPort" : "22", "IPProtocol" : "tcp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"}, {"FromPort": "1024", "ToPort" : "1024", "IPProtocol" : "tcp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"}, {"FromPort": "8080", "ToPort" : "8080", "IPProtocol" : "tcp", "Direction" : "inbound", "CIDR": "0.0.0.0/0"} ] } }' |json_pp + +sleep 5 +echo "## 2. SecurityGroup: AddRules" +curl -sX POST http://localhost:1024/spider/securitygroup/ncp-sg-01/rules -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "RuleInfoList" : [ {"Direction": "inbound", "IPProtocol": "TCP", "FromPort": "7080", "ToPort": "8080"}, {"Direction": "outbound", "IPProtocol": "TCP", "FromPort": "500", "ToPort": "500"} ]} }' |json_pp + +sleep 5 +echo "## 2. SecurityGroup: AddRules" +curl -sX POST http://localhost:1024/spider/securitygroup/ncp-sg-01/rules -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "RuleInfoList" : [ {"Direction": "inbound", "IPProtocol": "ALL", "FromPort": "-1", "ToPort": "-1"}, {"Direction": "outbound", "IPProtocol": "ALL", "FromPort": "-1", "ToPort": "-1"} ]} }' |json_pp + +sleep 5 + +echo "## 2. SecurityGroup: RemoveRules" +curl -sX DELETE http://localhost:1024/spider/securitygroup/ncp-sg-01/rules -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "RuleInfoList" : [ {"Direction": "inbound", "IPProtocol": "TCP", "FromPort": "7080", "ToPort": "8080"}, {"Direction": "outbound", "IPProtocol": "TCP", "FromPort": "500", "ToPort": "500"} ]} }' |json_pp + +sleep 5 + +echo "## 2. SecurityGroup: RemoveRules" +curl -sX DELETE http://localhost:1024/spider/securitygroup/ncp-sg-01/rules -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "RuleInfoList" : [ {"Direction": "inbound", "IPProtocol": "ALL", "FromPort": "-1", "ToPort": "-1"}, {"Direction": "outbound", "IPProtocol": "ALL", "FromPort": "-1", "ToPort": "-1"} ]} }' |json_pp + +sleep 5 + +echo "## 2. SecurityGroup: List" +curl -sX GET http://localhost:1024/spider/securitygroup -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 3 +echo "## 2. SecurityGroup: Get" + +curl -sX GET http://localhost:1024/spider/securitygroup/ncp-sg-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +curl -sX GET http://localhost:1024/spider/securitygroup/ncp-sg-02 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +curl -sX GET http://localhost:1024/spider/securitygroup/ncp-sg-03 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp +echo "#-----------------------------" + +echo "####################################################################" +echo "## 3. KeyPair: Create -> List -> Get" +echo "####################################################################" + +sleep 1 +echo "## 3. KeyPair: Create" +curl -sX POST http://localhost:1024/spider/keypair -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-key-01" } }' |json_pp + +sleep 5 +echo "## 3. KeyPair: List" +curl -sX GET http://localhost:1024/spider/keypair -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 +echo "## 3. KeyPair: Get" +curl -sX GET http://localhost:1024/spider/keypair/ncp-key-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp +echo "#-----------------------------" + +echo "####################################################################" +echo "## 4. VM: StartVM -> List -> Get -> ListStatus -> GetStatus -> Suspend -> Resume -> Reboot" +echo "####################################################################" + +sleep 1 +echo "## 4. VM: StartVM" +curl -sX POST http://localhost:1024/spider/vm -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'", "ReqInfo": { "Name": "ncp-vm-01", "ImageName": "'${IMAGE_NAME}'", "VPCName": "ncp-vpc-01", "SubnetName": "ncp-subnet-01", "SecurityGroupNames": [ "ncp-sg-01", "ncp-sg-02" ], "VMSpecName": "'${SPEC_NAME}'", "KeyPairName": "ncp-key-01"} }' |json_pp + +echo "============== sleep 50sec after start VM" + +sleep 50 + +echo "## 4. VM: List" +curl -sX GET http://localhost:1024/spider/vm -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 5sec after List VM" +sleep 5 +echo "## 4. VM: Get" +curl -sX GET http://localhost:1024/spider/vm/ncp-vm-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 10sec after Get VM" +sleep 10 +echo "## 4. VM: ListStatus" +curl -sX GET http://localhost:1024/spider/vmstatus -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 2sec after List VM Status" +sleep 2 +echo "## 4. VM: GetStatus" +curl -sX GET http://localhost:1024/spider/vmstatus/ncp-vm-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 5sec after Get VM Status" +sleep 5 +echo "## 4. VM: Suspend" +curl -sX GET http://localhost:1024/spider/controlvm/ncp-vm-01?action=suspend -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 40sec after suspend VM" +sleep 40 +echo "## 4. VM: Resume" +curl -sX GET http://localhost:1024/spider/controlvm/ncp-vm-01?action=resume -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 100sec after resume VM" +sleep 100 +echo "## 4. VM: Reboot" +curl -sX GET http://localhost:1024/spider/controlvm/ncp-vm-01?action=reboot -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 70sec after reboot VM" +sleep 70 +echo "#-----------------------------" + +echo "####################################################################" +echo "####################################################################" +echo "####################################################################" + +echo "####################################################################" +echo "## 4. VM: Terminate(Delete) " +echo "####################################################################" +curl -sX DELETE http://localhost:1024/spider/vm/ncp-vm-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "============== sleep 40sec after terminate VM" +sleep 40 + +echo "####################################################################" +echo "## 3. KeyPair: Delete" +echo "####################################################################" +curl -sX DELETE http://localhost:1024/spider/keypair/ncp-key-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 + +echo "####################################################################" +echo "## 2. SecurityGroup: Delete" +echo "####################################################################" +curl -sX DELETE http://localhost:1024/spider/securitygroup/ncp-sg-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 1 + +curl -sX DELETE http://localhost:1024/spider/securitygroup/ncp-sg-02 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 1 + +curl -sX DELETE http://localhost:1024/spider/securitygroup/ncp-sg-03 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +sleep 5 + +echo "####################################################################" +echo "## 1. VPC: Delete" +echo "####################################################################" +curl -sX DELETE http://localhost:1024/spider/vpc/ncp-vpc-01 -H 'Content-Type: application/json' -d '{ "ConnectionName": "'${CONN_CONFIG}'"}' |json_pp + +echo "#### Full Test Process - Finished ###" diff --git a/cloud-driver-libs/cloudos_meta.yaml b/cloud-driver-libs/cloudos_meta.yaml index cc2765e89..77256b424 100644 --- a/cloud-driver-libs/cloudos_meta.yaml +++ b/cloud-driver-libs/cloudos_meta.yaml @@ -71,11 +71,13 @@ NCP: region: Region / Zone credential: ClientId / ClientSecret # idmaxlength: VPC / Subnet / SecurityGroup / KeyPair / VM - idmaxlength: 0 / 0 / 0 / 30 / 30 + idmaxlength: 0 / 0 / 0 / 30 / 30 NCPVPC: region: Region / Zone credential: ClientId / ClientSecret + # idmaxlength: VPC / Subnet / SecurityGroup / KeyPair / VM + idmaxlength: 30 / 30 / 30 / 30 / 30 KTCLOUD: region: Region / Zone @@ -86,7 +88,7 @@ NHNCLOUD: credential: IdentityEndpoint / Username / Password / DomainName / TenantId rootdisktype: General_HDD / General_SSD # idmaxlength: VPC / Subnet / SecurityGroup / KeyPair / VM - idmaxlength: 0 / 0 / 255 / 255 / 255 + idmaxlength: 0 / 0 / 255 / 255 / 255 #--- PoC diff --git a/utils/driver-build-docker/2.build/ncpvpc-build.sh b/utils/driver-build-docker/2.build/ncpvpc-build.sh new file mode 100755 index 000000000..b4da9b83d --- /dev/null +++ b/utils/driver-build-docker/2.build/ncpvpc-build.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +# Build Scripts to build drivers with plugin mode. +# The driver repos can be other repos. +# cf) https://github.com/cloud-barista/cb-spider/issues/343 +# +# The CB-Spider is a sub-Framework of the Cloud-Barista Multi-Cloud Project. +# The CB-Spider Mission is to connect all the clouds with a single interface. +# +# * Cloud-Barista: https://github.com/cloud-barista +# +# by CB-Spider Team, 2022.01. + +# You have to run in driver build container. +echo "\$HOME" path is $HOME +echo "\$CBSPIDER_ROOT" path is $CBSPIDER_ROOT + +echo "# cd" $CBSPIDER_ROOT +cd $CBSPIDER_ROOT + +echo "# go get -v github.com/NaverCloudPlatform/ncloud-sdk-go-v2@v1.4.4" +go get -v github.com/NaverCloudPlatform/ncloud-sdk-go-v2@v1.4.4 + +cd $HOME + +echo "# git clone https://github.com/cloud-barista/ncpvpc.git" $HOME"/ncpvpc;" +git clone https://github.com/cloud-barista/ncpvpc.git $HOME/ncpvpc; + +ln -s $HOME/ncpvpc/ncpvpc $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers; +ln -s $HOME/ncpvpc/ncpvpc-plugin $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers; + +echo "# cd "$CBSPIDER_ROOT"/cloud-control-manager/cloud-driver/drivers/ncpvpc-plugin;" +cd $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/ncpvpc-plugin; + +echo "# ./build_driver_lib.sh" +./build_driver_lib.sh + +rm $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/ncpvpc; +rm $CBSPIDER_ROOT/cloud-control-manager/cloud-driver/drivers/ncpvpc-plugin; From 7c1efe4b0e70eb6963eda80236ffbac308a54c48 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 2 May 2022 00:52:33 +0900 Subject: [PATCH 2/3] Update go.mod and go.sum --- go.mod | 4 +++- go.sum | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e4e652ab4..b5bba1c84 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/IBM/go-sdk-core/v5 v5.5.1 github.com/IBM/vpc-go-sdk v0.8.0 github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1181 github.com/aws/aws-sdk-go v1.39.4 @@ -27,6 +28,7 @@ require ( github.com/chyeh/pubip v0.0.0-20170203095919-b7e679cf541c github.com/cloud-barista/cb-log v0.5.0 github.com/cloud-barista/cb-store v0.5.0 + github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff // indirect github.com/containerd/containerd v1.6.1 // indirect github.com/davecgh/go-spew v1.1.1 github.com/docker/docker v20.10.7+incompatible @@ -57,7 +59,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.206 github.com/uber/jaeger-client-go v2.29.1+incompatible github.com/uber/jaeger-lib v2.4.0+incompatible // indirect - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f google.golang.org/api v0.50.0 google.golang.org/grpc v1.43.0 diff --git a/go.sum b/go.sum index 10fd36f47..c1edab6fc 100644 --- a/go.sum +++ b/go.sum @@ -107,6 +107,8 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4 h1:5Irb44NKvgyM7lIp+onc96rLbX172aSwbOBVHP1LZlA= +github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4/go.mod h1:7+Hx3TCfPW8HE0ycOH4UJqkTEq7uZeYyk+N1FCDR4LA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -182,6 +184,8 @@ github.com/cloud-barista/cb-log v0.5.0 h1:WoUnXtNNNTA7wRgQa6sFNs57O3mLAOrh4aDHC4 github.com/cloud-barista/cb-log v0.5.0/go.mod h1:C0KNV97sw8IoLSlNuSiCGDQIuS/wXJaZWV/6MOwc20c= github.com/cloud-barista/cb-store v0.5.0 h1:1pqgmon1CQWQvjalm23K15G23qhP9hMoy9AUb8tn7bs= github.com/cloud-barista/cb-store v0.5.0/go.mod h1:EhuQfTQRoLPE6jCMMRGbM4OEIZv+Zk2Zf6wxsJ5GyEM= +github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff h1:KyG9g6nMh/K6je7idvCvXyIA9hIOUQLMO9n9vrmezXI= +github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff/go.mod h1:q/McfrXexk/qNfRpFlrBXzjlSIJYXkB3XG1AKs6l4Ts= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= @@ -1092,6 +1096,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 h1:kACShD3qhmr/3rLmg1yXyt+N4HcwutKyPRB93s54TIU= +golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1175,6 +1181,8 @@ golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211206223403-eba003a116a9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= From e036e744b6e44eb051366d2fc8438e57adc26a05 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 2 May 2022 00:56:40 +0900 Subject: [PATCH 3/3] Update go.mod and go.sum --- go.mod | 4 +--- go.sum | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b5bba1c84..e4e652ab4 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,6 @@ require ( github.com/IBM/go-sdk-core/v5 v5.5.1 github.com/IBM/vpc-go-sdk v0.8.0 github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1181 github.com/aws/aws-sdk-go v1.39.4 @@ -28,7 +27,6 @@ require ( github.com/chyeh/pubip v0.0.0-20170203095919-b7e679cf541c github.com/cloud-barista/cb-log v0.5.0 github.com/cloud-barista/cb-store v0.5.0 - github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff // indirect github.com/containerd/containerd v1.6.1 // indirect github.com/davecgh/go-spew v1.1.1 github.com/docker/docker v20.10.7+incompatible @@ -59,7 +57,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.206 github.com/uber/jaeger-client-go v2.29.1+incompatible github.com/uber/jaeger-lib v2.4.0+incompatible // indirect - golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f google.golang.org/api v0.50.0 google.golang.org/grpc v1.43.0 diff --git a/go.sum b/go.sum index c1edab6fc..10fd36f47 100644 --- a/go.sum +++ b/go.sum @@ -107,8 +107,6 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4 h1:5Irb44NKvgyM7lIp+onc96rLbX172aSwbOBVHP1LZlA= -github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.4.4/go.mod h1:7+Hx3TCfPW8HE0ycOH4UJqkTEq7uZeYyk+N1FCDR4LA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -184,8 +182,6 @@ github.com/cloud-barista/cb-log v0.5.0 h1:WoUnXtNNNTA7wRgQa6sFNs57O3mLAOrh4aDHC4 github.com/cloud-barista/cb-log v0.5.0/go.mod h1:C0KNV97sw8IoLSlNuSiCGDQIuS/wXJaZWV/6MOwc20c= github.com/cloud-barista/cb-store v0.5.0 h1:1pqgmon1CQWQvjalm23K15G23qhP9hMoy9AUb8tn7bs= github.com/cloud-barista/cb-store v0.5.0/go.mod h1:EhuQfTQRoLPE6jCMMRGbM4OEIZv+Zk2Zf6wxsJ5GyEM= -github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff h1:KyG9g6nMh/K6je7idvCvXyIA9hIOUQLMO9n9vrmezXI= -github.com/cloud-barista/nhncloud-sdk-for-drv v0.0.0-20220127055541-afbafa12d4ff/go.mod h1:q/McfrXexk/qNfRpFlrBXzjlSIJYXkB3XG1AKs6l4Ts= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= @@ -1096,8 +1092,6 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 h1:kACShD3qhmr/3rLmg1yXyt+N4HcwutKyPRB93s54TIU= -golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1181,8 +1175,6 @@ golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211206223403-eba003a116a9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=