From 34e83f5b9132516d21ebeb54cdb8c1adc4da1424 Mon Sep 17 00:00:00 2001 From: Michael Turek Date: Tue, 9 Nov 2021 13:57:58 -0500 Subject: [PATCH] Import image via COS --- data/data/powervs/bootstrap/main.tf | 7 +-- data/data/powervs/bootstrap/variables.tf | 2 +- data/data/powervs/main.tf | 17 ++++--- data/data/powervs/master/main.tf | 7 +-- data/data/powervs/master/variables.tf | 2 +- data/data/powervs/variables-powervs.tf | 17 ++++--- go.mod | 16 ++++--- go.sum | 56 ++++++++++++++---------- vendor/modules.txt | 47 +++++++++++++------- 9 files changed, 102 insertions(+), 69 deletions(-) diff --git a/data/data/powervs/bootstrap/main.tf b/data/data/powervs/bootstrap/main.tf index c9496bd6bb7..bb38c885c5a 100644 --- a/data/data/powervs/bootstrap/main.tf +++ b/data/data/powervs/bootstrap/main.tf @@ -7,11 +7,6 @@ data "ibm_pi_network" "network" { pi_cloud_instance_id = var.cloud_instance_id } -data "ibm_pi_image" "bootstrap_image" { - pi_image_name = var.image_name - pi_cloud_instance_id = var.cloud_instance_id -} - data "ignition_config" "bootstrap" { merge { source = ibms3presign.bootstrap_ignition.presigned_url @@ -69,7 +64,7 @@ resource "ibm_pi_instance" "bootstrap" { pi_processors = var.processors pi_instance_name = "${var.cluster_id}-bootstrap" pi_proc_type = var.proc_type - pi_image_id = data.ibm_pi_image.bootstrap_image.id + pi_image_id = var.image_id pi_sys_type = var.sys_type pi_cloud_instance_id = var.cloud_instance_id pi_network_ids = [data.ibm_pi_network.network.id] diff --git a/data/data/powervs/bootstrap/variables.tf b/data/data/powervs/bootstrap/variables.tf index c2f744e7b97..b5dc4531368 100644 --- a/data/data/powervs/bootstrap/variables.tf +++ b/data/data/powervs/bootstrap/variables.tf @@ -4,7 +4,7 @@ variable "ignition" {} variable "cloud_instance_id" {} variable "resource_group" {} -variable "image_name" {} +variable "image_id" {} variable "network_name" {} variable "proc_type" {} variable "sys_type" {} diff --git a/data/data/powervs/main.tf b/data/data/powervs/main.tf index 081ef3e59eb..db626671ef1 100644 --- a/data/data/powervs/main.tf +++ b/data/data/powervs/main.tf @@ -37,7 +37,7 @@ module "bootstrap" { sys_type = var.powervs_sys_type proc_type = var.powervs_proc_type key_id = ibm_pi_key.cluster_key.key_id - image_name = var.powervs_image_name + image_id = ibm_pi_image.boot_image.image_id network_name = var.powervs_network_name } @@ -57,7 +57,7 @@ module "master" { sys_type = var.powervs_sys_type proc_type = var.powervs_proc_type key_id = ibm_pi_key.cluster_key.key_id - image_name = var.powervs_image_name + image_id = ibm_pi_image.boot_image.image_id network_name = var.powervs_network_name } @@ -66,10 +66,15 @@ data "ibm_is_subnet" "vpc_subnet" { name = var.powervs_vpc_subnet_name } -data "ibm_pi_image" "boot_image" { - provider = ibm.powervs - pi_image_name = var.powervs_image_name - pi_cloud_instance_id = var.powervs_cloud_instance_id +resource "ibm_pi_image" "boot_image" { + provider = ibm.powervs + pi_image_name = "${var.cluster_id}-boot-image" + pi_cloud_instance_id = var.powervs_cloud_instance_id + pi_image_bucket_name = "rhcos-powervs-images-${var.powervs_vpc_region}" + pi_image_bucket_access = "public" + pi_image_bucket_region = var.powervs_vpc_region + pi_image_bucket_file_name = var.powervs_image_bucket_file_name + pi_image_storage_type = var.powervs_image_storage_type } data "ibm_pi_network" "pvs_net" { diff --git a/data/data/powervs/master/main.tf b/data/data/powervs/master/main.tf index 568526cd027..3f885da5665 100644 --- a/data/data/powervs/master/main.tf +++ b/data/data/powervs/master/main.tf @@ -7,11 +7,6 @@ data "ibm_pi_network" "network" { pi_cloud_instance_id = var.cloud_instance_id } -data "ibm_pi_image" "master_image" { - pi_image_name = var.image_name - pi_cloud_instance_id = var.cloud_instance_id -} - # Create the master instances resource "ibm_pi_instance" "master" { count = var.instance_count @@ -19,7 +14,7 @@ resource "ibm_pi_instance" "master" { pi_processors = var.processors pi_instance_name = "${var.cluster_id}-master-${count.index}" pi_proc_type = var.proc_type - pi_image_id = data.ibm_pi_image.master_image.id + pi_image_id = var.image_id pi_sys_type = var.sys_type pi_cloud_instance_id = var.cloud_instance_id pi_network_ids = [data.ibm_pi_network.network.id] diff --git a/data/data/powervs/master/variables.tf b/data/data/powervs/master/variables.tf index 7168d59b459..c977befe336 100644 --- a/data/data/powervs/master/variables.tf +++ b/data/data/powervs/master/variables.tf @@ -7,7 +7,7 @@ variable "key_id" {} variable "cloud_instance_id" {} variable "resource_group" {} -variable "image_name" {} +variable "image_id" {} variable "network_name" {} variable "proc_type" {} variable "sys_type" {} diff --git a/data/data/powervs/variables-powervs.tf b/data/data/powervs/variables-powervs.tf index d172530f49d..d44e53a2e8c 100644 --- a/data/data/powervs/variables-powervs.tf +++ b/data/data/powervs/variables-powervs.tf @@ -63,11 +63,6 @@ variable "powervs_cos_storage_class" { ################################################################ # Configure instances ################################################################ -variable "powervs_image_name" { - type = string - description = "Name of the image used by all nodes in the cluster." -} - variable "powervs_bootstrap_memory" { type = string description = "Amount of memory, in GiB, used by the bootstrap node." @@ -116,6 +111,18 @@ variable "powervs_ssh_key" { default = "" } +variable "powervs_image_bucket_file_name" { + type = string + description = "File name of the image in the COS bucket." + default = "rhcos-410-84-202111101637-0-ppc64le-powervs.ova.gz" +} + +variable "powervs_image_storage_type" { + type = string + description = "Storage type used when storing image in Power VS." + default = "tier3" +} + ################################################################ # Configure Network Topology ################################################################ diff --git a/go.mod b/go.mod index d222486b965..3bb6e51e465 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/Azure/go-autorest/autorest/to v0.4.0 github.com/Azure/go-ntlmssp v0.0.0-20191115210519-2b2be6cc8ed4 // indirect github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d // indirect - github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05 + github.com/IBM-Cloud/bluemix-go v0.0.0-20210706092416-dc4055f8e0ea github.com/IBM-Cloud/power-go-client v1.0.72 github.com/IBM-Cloud/terraform-provider-ibm v1.26.2 - github.com/IBM/go-sdk-core/v5 v5.4.3 - github.com/IBM/networking-go-sdk v0.14.0 + github.com/IBM/go-sdk-core/v5 v5.5.1 + github.com/IBM/networking-go-sdk v0.19.0 github.com/IBM/platform-services-go-sdk v0.18.16 github.com/IBM/vpc-go-sdk v1.0.1 github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 // indirect @@ -102,7 +102,7 @@ require ( github.com/vmware/govmomi v0.24.0 github.com/wxnacy/wgo v1.0.4 github.com/zclconf/go-cty v1.6.1 - golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 golang.org/x/lint v0.0.0-20200302205851-738671d3881b golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c @@ -126,7 +126,7 @@ require ( replace ( cloud.google.com/go => cloud.google.com/go v0.57.0 - github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2 + github.com/IBM-Cloud/terraform-provider-ibm => github.com/yussufsh/terraform-provider-ibm v1.89.0 github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb // Pinned by MCO github.com/hashicorp/terraform => github.com/openshift/terraform v0.12.20-openshift-4 // Pin to fork with deduplicated rpc types v0.12.20-openshift-4 github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.14.0-openshift // Pin to fork with public rpc types @@ -152,7 +152,7 @@ replace ( // Prevent the following modules from upgrading version as result of terraform-provider-kubernetes module // The following modules need to be locked to compile correctly with terraform-provider-azure, terraform-provider-google, and terraform-provider-ibm replace ( - github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.7.0 + github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.8.0 github.com/apparentlymart/go-cidr => github.com/apparentlymart/go-cidr v1.0.1 github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.32.3 github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2 @@ -166,3 +166,7 @@ replace ( ) replace github.com/openshift/machine-api-operator => github.com/openshift-powervs/machine-api-operator v0.2.1-0.20210809115935-a9fd8f5d2767 + +replace github.com/IBM-Cloud/power-go-client => github.com/yussufsh/power-go-client v1.99.4 + +replace github.com/softlayer/softlayer-go => github.com/IBM-Cloud/softlayer-go v1.0.3-tf diff --git a/go.sum b/go.sum index 10c1b9d43d9..1ec1f6be220 100644 --- a/go.sum +++ b/go.sum @@ -118,12 +118,13 @@ github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5H github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/IBM-Cloud/bluemix-go v0.0.0-20200921095234-26d1d0148c62/go.mod h1:gPJbH1etcDj7qS/hBRiLuYW9CY0bRcostSKusa51xR0= -github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05 h1:b/epmuvf99xhUlf81l0r/ciONJSjoUs78t+BC7lCcvI= -github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05/go.mod h1:kqTYO0mts71aa8PVwviaKlCKYud/NbEkFIqU8aHH3/g= +github.com/IBM-Cloud/bluemix-go v0.0.0-20210706092416-dc4055f8e0ea h1:3B8Hd2WknLK8mA8UonA2MxgkMS9ZdLK0PjUwgc+czTU= +github.com/IBM-Cloud/bluemix-go v0.0.0-20210706092416-dc4055f8e0ea/go.mod h1:AEc+cXhUc63zc7PB1YjvZFoRtfCJcI12w5TrLudEgXg= +github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20210705152127-41ca00fc9a62 h1:MOkcr6qQGk4tY542ZJ1DggVh2WUP72EEyLB79llFVH8= +github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20210705152127-41ca00fc9a62/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY= github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs= -github.com/IBM-Cloud/power-go-client v1.0.55/go.mod h1:I4r5tCrA8mV5GFqGAJG4/Tn+/JpR+XLnDCLLNVKJxuI= -github.com/IBM-Cloud/power-go-client v1.0.72 h1:5qoU8JPnFL5dRVR6oimGtAlcnSSDrD9KWs8Co9hAdMs= -github.com/IBM-Cloud/power-go-client v1.0.72/go.mod h1:I4r5tCrA8mV5GFqGAJG4/Tn+/JpR+XLnDCLLNVKJxuI= +github.com/IBM-Cloud/softlayer-go v1.0.3-tf h1:FZF0D11BcYvDCZtWC0ZNEC6PKivuahW/nW9naK7H2PU= +github.com/IBM-Cloud/softlayer-go v1.0.3-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4= github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca h1:crniVcf+YcmgF03NmmfonXwSQ73oJF+IohFYBwknMxs= github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca/go.mod h1:IjXrnOcTe92Q4pEBHmui3H/GM1hw5Pd0zXA5cw5/iZU= github.com/IBM/appconfiguration-go-admin-sdk v0.1.0 h1:9rdOk32VQFnMqsBB7cTpkZbD7/b0EnwrU3VNN8vuUYc= @@ -133,9 +134,8 @@ github.com/IBM/container-registry-go-sdk v0.0.13/go.mod h1:GYi1VN59VaJWWq2xP06o9 github.com/IBM/go-sdk-core v1.1.0 h1:pV73lZqr9r1xKb3h08c1uNG3AphwoV5KzUzhS+pfEqY= github.com/IBM/go-sdk-core v1.1.0/go.mod h1:2pcx9YWsIsZ3I7kH+1amiAkXvLTZtAq9kbxsfXilSoY= github.com/IBM/go-sdk-core/v3 v3.0.0/go.mod h1:JI5NS2+iCoY/D8Oq3JNEZNA7qO42agu6fnaUmDsRcJA= +github.com/IBM/go-sdk-core/v3 v3.2.4 h1:WKYJYYKlZnw1y/gM+Qbf5EQVAL9xaoD54+ooJZz/iBQ= github.com/IBM/go-sdk-core/v3 v3.2.4/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QCCKDRsUA2M0= -github.com/IBM/go-sdk-core/v3 v3.3.1 h1:DoXjP1+Wm8Yd4XJsvBMRcYLvQwSLFnzKlMjSrg3Rzpw= -github.com/IBM/go-sdk-core/v3 v3.3.1/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QCCKDRsUA2M0= github.com/IBM/go-sdk-core/v4 v4.5.1/go.mod h1:lTUXbqIX6/aAbSCkP6q59+dyFsTwZAc0ewRS2vJWVbg= github.com/IBM/go-sdk-core/v4 v4.8.1/go.mod h1:GECJ/p0r9Hs0XcOnCiGjZrt6M/rQc+gW8YkCsGJ+j5U= github.com/IBM/go-sdk-core/v4 v4.9.0/go.mod h1:DbQ+3pFoIjxGGTEiA9zQ2V0cemMNmFMkLBBnR729HKg= @@ -144,20 +144,21 @@ github.com/IBM/go-sdk-core/v4 v4.10.0/go.mod h1:0uz2ca0MZ2DwsBRGl9Jp3EaCTqxmKZTd github.com/IBM/go-sdk-core/v5 v5.0.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= github.com/IBM/go-sdk-core/v5 v5.0.3/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= github.com/IBM/go-sdk-core/v5 v5.1.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= -github.com/IBM/go-sdk-core/v5 v5.4.0/go.mod h1:+MNa5Jbqb9FO7KEevo982Pb/YXr4adkyEffJlPs2TGc= github.com/IBM/go-sdk-core/v5 v5.4.2/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= -github.com/IBM/go-sdk-core/v5 v5.4.3 h1:g3HUKD2wyptGTAGOjS4IkYWmLFgGsioFCnBUXz5NB4g= -github.com/IBM/go-sdk-core/v5 v5.4.3/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= +github.com/IBM/go-sdk-core/v5 v5.4.5/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= +github.com/IBM/go-sdk-core/v5 v5.5.1 h1:Hb4xB1BL8L6uCnskIqSCxF9wLfOmj4+sVzM5vFtuhs4= +github.com/IBM/go-sdk-core/v5 v5.5.1/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= github.com/IBM/ibm-cos-sdk-go v1.3.1/go.mod h1:YLBAYobEA8bD27P7xpMwSQeNQu6W3DNBtBComXrRzRY= github.com/IBM/ibm-cos-sdk-go v1.7.0 h1:3DZULY/D5WzjlIm+Iaj6h0surEjQs65EZk1YAe8+rj0= github.com/IBM/ibm-cos-sdk-go v1.7.0/go.mod h1:Oi8AC5WNDhmUJgbo1GL2FtBdo0nRgbzE/1HmCL1SERU= github.com/IBM/ibm-cos-sdk-go-config v1.2.0 h1:1E93234yZgVS0ntm7eUwVb3h0AAayPGcxEhhizEN1LE= github.com/IBM/ibm-cos-sdk-go-config v1.2.0/go.mod h1:Wetfgv6m1xyuzpZLQTTLIBsWstxjYa15h+Utj7x53Dk= +github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20210723145459-a232c3f3ac91 h1:8ICDvg7YM+PmfF+LQ42D4w/p4QEpiknbycAgGdbk0dw= +github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20210723145459-a232c3f3ac91/go.mod h1:M2JyuyeWHPtgGNeezr6YqVRuaav2MpY8Ha4QrEYvMoI= github.com/IBM/keyprotect-go-client v0.7.0 h1:JstSHD14Lp6ihwQseyPuGcs1AjOBjAmcisP0dTBA6A0= github.com/IBM/keyprotect-go-client v0.7.0/go.mod h1:SVr2ylV/fhSQPDiUjWirN9fsyWFCNNbt8GIT8hPJVjE= -github.com/IBM/networking-go-sdk v0.14.0 h1:CWQufnSxynqxYORGbkSqePPSZ33fUijiwmcuZsMRv/Q= -github.com/IBM/networking-go-sdk v0.14.0/go.mod h1:8f3hEoWVUSYKbaIj7WZhdeJaseYGDSY85Iz+PqxLEbQ= -github.com/IBM/platform-services-go-sdk v0.18.12/go.mod h1:awc7TZUeGMlToSeMSaWEz34Knf0lQnuGWumcI4pcuoM= +github.com/IBM/networking-go-sdk v0.19.0 h1:oXmRZPLnL28OE7bVRJLvKB6vGYjCG58pLWAeTjVBajs= +github.com/IBM/networking-go-sdk v0.19.0/go.mod h1:nViqUm1Bv+ke8dyOhjQ6e+2U1XeqZX2y4bQbR8Od3Hc= github.com/IBM/platform-services-go-sdk v0.18.16 h1:blYycstPoNtPKtu1uZe240WvzcJENy/Lzx+HMUA8bOo= github.com/IBM/platform-services-go-sdk v0.18.16/go.mod h1:awc7TZUeGMlToSeMSaWEz34Knf0lQnuGWumcI4pcuoM= github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4= @@ -166,11 +167,13 @@ github.com/IBM/schematics-go-sdk v0.0.2 h1:IFdM73VL3xwf/KaTh1IY99hkiTfFRYg5F1JNj github.com/IBM/schematics-go-sdk v0.0.2/go.mod h1:ymN1+3uEaWNT0RthwHzExxMiN0AnTh6W3piSY8canjs= github.com/IBM/secrets-manager-go-sdk v0.1.19 h1:0GPs5EoTaWNsjo4QPj64GNxlWfN8VHJy4RDFLqddSe8= github.com/IBM/secrets-manager-go-sdk v0.1.19/go.mod h1:eO3dBhzPrHkkt+yPex/jB2xD6qHZxBko+Aw+0tfqHeA= -github.com/IBM/vpc-go-sdk v0.7.0 h1:LNAnzcDLD2Bf2UbiYfFFsWGlHQf2N/Qc6S5iM7qln1o= -github.com/IBM/vpc-go-sdk v0.7.0/go.mod h1:wxicPDnSTPXt1eNxSO/9KNGqOW9RMgxPoSh4gd8KJY4= +github.com/IBM/vpc-go-sdk v0.8.0 h1:CPuLXuKa0fbhAR+veaynW8AtGqkO846XYBdfTQGrq4s= +github.com/IBM/vpc-go-sdk v0.8.0/go.mod h1:rnMs3IWLSr0n0MvqX3pg96u0mkHVBk4oBsHQYYv5CXw= github.com/InVisionApp/go-health v2.1.0+incompatible/go.mod h1:/+Gv1o8JUsrjC6pi6MN6/CgKJo4OqZ6x77XAnImrzhg= github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0= +github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:Zb3OT4l0mf7P/GOs2w2Ilj5sdm5Whoq3pa24dAEBHFc= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= @@ -196,6 +199,8 @@ github.com/PaesslerAG/gval v1.0.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= github.com/PaesslerAG/jsonpath v0.1.1 h1:c1/AToHQMVsduPAa4Vh6xp2U0evy4t8SWp8imEsylIk= github.com/PaesslerAG/jsonpath v0.1.1/go.mod h1:lVboNxFGal/VwW6d9JzIy56bUsYAP6tH/x80vjnCseY= +github.com/PromonLogicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:zL3Ph7RCZadAPb7QV0gMIDmjuZHFawNhoPZ5erh6TRw= +github.com/PromonLogicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:nE9BGpMlMfM9Z3U+P+mWtcHNDwHcGctalMx1VTkODAY= github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -788,6 +793,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= +github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1461,6 +1468,7 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= +github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1477,6 +1485,7 @@ github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= +github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.14.0 h1:ep6kpPVwmr/nTbklSx2nrLNSIO62DoYAhnPNIMhK8gI= github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1563,8 +1572,6 @@ github.com/openshift/terraform-provider-azurerm v1.44.1-0.20210224232508-7509319 github.com/openshift/terraform-provider-azurerm v1.44.1-0.20210224232508-7509319df0f4/go.mod h1:MohWawSEwkGnsTTEW/U/sPVxsgQVHBNg2LsqQPbMa/U= github.com/openshift/terraform-provider-azurestack v0.10.0-openshift h1:OB8vX01eavwH+6pdJjAh5nE2HYfnotzHpXtNbugTOQo= github.com/openshift/terraform-provider-azurestack v0.10.0-openshift/go.mod h1:wUvqPoPkdMZxYSgdyePsJm8mYbjAeIwR5hEyY9/UFI4= -github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2 h1:HxvKVrzgLpfuzxU3KfYeruRuop1pG34rh2yXTKn42+I= -github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2/go.mod h1:LnGKkV2HJUeJrIMMPK+/Ka6F+5JIy45mbEj9VpoHHqc= github.com/openshift/terraform-provider-vsphere v1.24.3-openshift h1:tG83XgfFwH4OLONUeEsxh8JPG9QRrqKLoPzkPmLye/Y= github.com/openshift/terraform-provider-vsphere v1.24.3-openshift/go.mod h1:FgcsrcPpnjLUO4XWpudYiBho9ETIXYRxVXWV7R3Iz6k= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= @@ -1767,8 +1774,6 @@ github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/softlayer/softlayer-go v1.0.3 h1:9FONm5xzQ9belQtbdryR6gBg4EF6hX6lrjNKi0IvZkU= -github.com/softlayer/softlayer-go v1.0.3/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4= github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e h1:3OgWYFw7jxCZPcvAg+4R8A50GZ+CCkARF10lxu2qDsQ= github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e/go.mod h1:fKZCUVdirrxrBpwd9wb+lSoVixvpwAu8eHzbQB2tums= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1952,6 +1957,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc= +github.com/yussufsh/power-go-client v1.99.4 h1:+7Zz60BOBZCOlTkbU8LeNiwh2wRfZ+anNwcTG+X30eg= +github.com/yussufsh/power-go-client v1.99.4/go.mod h1:I4r5tCrA8mV5GFqGAJG4/Tn+/JpR+XLnDCLLNVKJxuI= +github.com/yussufsh/terraform-provider-ibm v1.89.0 h1:gjdIIr5DFPQg2ncFVQcM7sgouBCC4ZEtrTqmnezpVoU= +github.com/yussufsh/terraform-provider-ibm v1.89.0/go.mod h1:iPP4zVJhZ0YsaPNVaWNTZHYmWLXFAoou4uE+kRkYF+M= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.1.1/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= @@ -2049,8 +2058,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/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-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -2136,14 +2145,14 @@ golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2255,6 +2264,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/vendor/modules.txt b/vendor/modules.txt index fcd30b89842..c50386fdfcb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -202,7 +202,7 @@ github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlbuilder github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlele github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlnode github.com/ChrisTrenkamp/goxpath/xconst -# github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05 +# github.com/IBM-Cloud/bluemix-go v0.0.0-20210706092416-dc4055f8e0ea ## explicit github.com/IBM-Cloud/bluemix-go github.com/IBM-Cloud/bluemix-go/api/account/accountv1 @@ -240,7 +240,10 @@ github.com/IBM-Cloud/bluemix-go/rest github.com/IBM-Cloud/bluemix-go/session github.com/IBM-Cloud/bluemix-go/trace github.com/IBM-Cloud/bluemix-go/utils -# github.com/IBM-Cloud/power-go-client v1.0.72 +# github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20210705152127-41ca00fc9a62 +github.com/IBM-Cloud/container-services-go-sdk/common +github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1 +# github.com/IBM-Cloud/power-go-client v1.0.72 => github.com/yussufsh/power-go-client v1.99.4 ## explicit github.com/IBM-Cloud/power-go-client/clients/instance github.com/IBM-Cloud/power-go-client/errors @@ -257,16 +260,20 @@ github.com/IBM-Cloud/power-go-client/power/client/p_cloud_cloud_connections github.com/IBM-Cloud/power-go-client/power/client/p_cloud_events github.com/IBM-Cloud/power-go-client/power/client/p_cloud_images github.com/IBM-Cloud/power-go-client/power/client/p_cloud_instances +github.com/IBM-Cloud/power-go-client/power/client/p_cloud_jobs github.com/IBM-Cloud/power-go-client/power/client/p_cloud_networks github.com/IBM-Cloud/power-go-client/power/client/p_cloud_p_vm_instances github.com/IBM-Cloud/power-go-client/power/client/p_cloud_placement_groups github.com/IBM-Cloud/power-go-client/power/client/p_cloud_s_a_p +github.com/IBM-Cloud/power-go-client/power/client/p_cloud_service_d_h_c_p github.com/IBM-Cloud/power-go-client/power/client/p_cloud_snapshots github.com/IBM-Cloud/power-go-client/power/client/p_cloud_storage_capacity github.com/IBM-Cloud/power-go-client/power/client/p_cloud_system_pools github.com/IBM-Cloud/power-go-client/power/client/p_cloud_tasks github.com/IBM-Cloud/power-go-client/power/client/p_cloud_tenants github.com/IBM-Cloud/power-go-client/power/client/p_cloud_tenants_ssh_keys +github.com/IBM-Cloud/power-go-client/power/client/p_cloud_v_p_n_connections +github.com/IBM-Cloud/power-go-client/power/client/p_cloud_v_p_n_policies github.com/IBM-Cloud/power-go-client/power/client/p_cloud_volumes github.com/IBM-Cloud/power-go-client/power/client/service_bindings github.com/IBM-Cloud/power-go-client/power/client/service_instances @@ -274,7 +281,7 @@ github.com/IBM-Cloud/power-go-client/power/client/storage_types github.com/IBM-Cloud/power-go-client/power/client/swagger_spec github.com/IBM-Cloud/power-go-client/power/models github.com/IBM-Cloud/power-go-client/utils -# github.com/IBM-Cloud/terraform-provider-ibm v1.26.2 => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2 +# github.com/IBM-Cloud/terraform-provider-ibm v1.26.2 => github.com/yussufsh/terraform-provider-ibm v1.89.0 ## explicit github.com/IBM-Cloud/terraform-provider-ibm/ibm github.com/IBM-Cloud/terraform-provider-ibm/ibm/internal/hashcode @@ -289,13 +296,11 @@ github.com/IBM/appconfiguration-go-admin-sdk/common # github.com/IBM/container-registry-go-sdk v0.0.13 github.com/IBM/container-registry-go-sdk/common github.com/IBM/container-registry-go-sdk/containerregistryv1 -# github.com/IBM/go-sdk-core v1.1.0 -github.com/IBM/go-sdk-core/core -# github.com/IBM/go-sdk-core/v3 v3.3.1 +# github.com/IBM/go-sdk-core/v3 v3.2.4 github.com/IBM/go-sdk-core/v3/core # github.com/IBM/go-sdk-core/v4 v4.10.0 github.com/IBM/go-sdk-core/v4/core -# github.com/IBM/go-sdk-core/v5 v5.4.3 +# github.com/IBM/go-sdk-core/v5 v5.5.1 ## explicit github.com/IBM/go-sdk-core/v5/core # github.com/IBM/ibm-cos-sdk-go v1.7.0 @@ -341,10 +346,15 @@ github.com/IBM/ibm-cos-sdk-go/service/s3 # github.com/IBM/ibm-cos-sdk-go-config v1.2.0 github.com/IBM/ibm-cos-sdk-go-config/common github.com/IBM/ibm-cos-sdk-go-config/resourceconfigurationv1 +# github.com/IBM/ibm-hpcs-tke-sdk v0.0.0-20210723145459-a232c3f3ac91 +github.com/IBM/ibm-hpcs-tke-sdk/common +github.com/IBM/ibm-hpcs-tke-sdk/ep11cmds +github.com/IBM/ibm-hpcs-tke-sdk/rest +github.com/IBM/ibm-hpcs-tke-sdk/tkesdk # github.com/IBM/keyprotect-go-client v0.7.0 github.com/IBM/keyprotect-go-client github.com/IBM/keyprotect-go-client/iam -# github.com/IBM/networking-go-sdk v0.14.0 +# github.com/IBM/networking-go-sdk v0.19.0 ## explicit github.com/IBM/networking-go-sdk/cachingapiv1 github.com/IBM/networking-go-sdk/cisipapiv1 @@ -356,6 +366,7 @@ github.com/IBM/networking-go-sdk/dnsrecordbulkv1 github.com/IBM/networking-go-sdk/dnsrecordsv1 github.com/IBM/networking-go-sdk/dnssvcsv1 github.com/IBM/networking-go-sdk/edgefunctionsapiv1 +github.com/IBM/networking-go-sdk/filtersv1 github.com/IBM/networking-go-sdk/globalloadbalancermonitorv1 github.com/IBM/networking-go-sdk/globalloadbalancerpoolsv0 github.com/IBM/networking-go-sdk/globalloadbalancerv1 @@ -392,11 +403,12 @@ github.com/IBM/schematics-go-sdk/schematicsv1 # github.com/IBM/secrets-manager-go-sdk v0.1.19 github.com/IBM/secrets-manager-go-sdk/common github.com/IBM/secrets-manager-go-sdk/secretsmanagerv1 -# github.com/IBM/vpc-go-sdk v1.0.1 => github.com/IBM/vpc-go-sdk v0.7.0 +# github.com/IBM/vpc-go-sdk v1.0.1 => github.com/IBM/vpc-go-sdk v0.8.0 ## explicit github.com/IBM/vpc-go-sdk/common -github.com/IBM/vpc-go-sdk/vpcclassicv1 github.com/IBM/vpc-go-sdk/vpcv1 +# github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 +github.com/Logicalis/asn1 # github.com/MakeNowJust/heredoc v1.0.0 github.com/MakeNowJust/heredoc # github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 @@ -906,6 +918,8 @@ github.com/gogo/protobuf/gogoproto github.com/gogo/protobuf/proto github.com/gogo/protobuf/protoc-gen-gogo/descriptor github.com/gogo/protobuf/sortkeys +# github.com/golang-jwt/jwt v3.2.1+incompatible +github.com/golang-jwt/jwt # github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/golang/groupcache/lru # github.com/golang/mock v1.6.0 @@ -1649,7 +1663,7 @@ github.com/shurcooL/vfsgen ## explicit github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/test -# github.com/softlayer/softlayer-go v1.0.3 +# github.com/softlayer/softlayer-go v1.0.3 => github.com/IBM-Cloud/softlayer-go v1.0.3-tf github.com/softlayer/softlayer-go/config github.com/softlayer/softlayer-go/datatypes github.com/softlayer/softlayer-go/filter @@ -2211,13 +2225,14 @@ go.starlark.net/resolve go.starlark.net/starlark go.starlark.net/starlarkstruct go.starlark.net/syntax -# golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 +# golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 ## explicit golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish golang.org/x/crypto/cast5 golang.org/x/crypto/chacha20 golang.org/x/crypto/curve25519 +golang.org/x/crypto/curve25519/internal/field golang.org/x/crypto/ed25519 golang.org/x/crypto/ed25519/internal/edwards25519 golang.org/x/crypto/internal/subtle @@ -2246,7 +2261,7 @@ golang.org/x/mod/internal/lazyregexp golang.org/x/mod/modfile golang.org/x/mod/module golang.org/x/mod/semver -# golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 +# golang.org/x/net v0.0.0-20210614182718-04defd469f4e golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/html @@ -3061,7 +3076,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml # cloud.google.com/go => cloud.google.com/go v0.57.0 -# github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2 +# github.com/IBM-Cloud/terraform-provider-ibm => github.com/yussufsh/terraform-provider-ibm v1.89.0 # github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb # github.com/hashicorp/terraform => github.com/openshift/terraform v0.12.20-openshift-4 # github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.14.0-openshift @@ -3082,7 +3097,7 @@ sigs.k8s.io/yaml # sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20210302164104-8498241fa4bd # sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0-alpha.1 # sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185 -# github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.7.0 +# github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.8.0 # github.com/apparentlymart/go-cidr => github.com/apparentlymart/go-cidr v1.0.1 # github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.32.3 # github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2 @@ -3094,3 +3109,5 @@ sigs.k8s.io/yaml # google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 # google.golang.org/grpc => google.golang.org/grpc v1.29.1 # github.com/openshift/machine-api-operator => github.com/openshift-powervs/machine-api-operator v0.2.1-0.20210809115935-a9fd8f5d2767 +# github.com/IBM-Cloud/power-go-client => github.com/yussufsh/power-go-client v1.99.4 +# github.com/softlayer/softlayer-go => github.com/IBM-Cloud/softlayer-go v1.0.3-tf