Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package terraform-provider-vsphere for
openSUSE:Factory checked in at 2021-03-30 20:52:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/terraform-provider-vsphere (Old)
and /work/SRC/openSUSE:Factory/.terraform-provider-vsphere.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terraform-provider-vsphere"
Tue Mar 30 20:52:51 2021 rev:8 rq:864247 version:1.24.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/terraform-provider-vsphere/terraform-provider-vsphere.changes
2020-11-26 23:16:21.405082469 +0100
+++
/work/SRC/openSUSE:Factory/.terraform-provider-vsphere.new.2401/terraform-provider-vsphere.changes
2021-03-30 20:53:23.832250644 +0200
@@ -1,0 +2,13 @@
+Mon Jan 18 15:38:38 UTC 2021 - John Paul Adrian Glaubitz
<[email protected]>
+
+- Update to version 1.24.3:
+ * Pre-release changelog update
+ * Make API timeout configurable when building VMs
+ * Use Dockerhub Mirror. (#1253)
+ * Suspend stale issue pruning (#1250)
+ * Support for no disks in config (#1241)
+- from version 1.24.2
+ * Update CHANGELOG.md
+ * Avoid nil condition for guestID (#1234)
+
+-------------------------------------------------------------------
Old:
----
terraform-provider-vsphere-1.24.1.obscpio
terraform-provider-vsphere-1.24.1.tar.xz
New:
----
terraform-provider-vsphere-1.24.3.obscpio
terraform-provider-vsphere-1.24.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ terraform-provider-vsphere.spec ++++++
--- /var/tmp/diff_new_pack.REjsig/_old 2021-03-30 20:53:24.980251931 +0200
+++ /var/tmp/diff_new_pack.REjsig/_new 2021-03-30 20:53:24.984251935 +0200
@@ -1,7 +1,7 @@
#
# spec file for package terraform-provider-vsphere
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
%endif
Name: terraform-provider-vsphere
-Version: 1.24.1
+Version: 1.24.3
Release: 0
Summary: Terraform vSphere provider
License: MPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.REjsig/_old 2021-03-30 20:53:25.040251998 +0200
+++ /var/tmp/diff_new_pack.REjsig/_new 2021-03-30 20:53:25.044252002 +0200
@@ -5,7 +5,7 @@
<param name="filename">terraform-provider-vsphere</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">v1.24.1</param>
+ <param name="revision">v1.24.3</param>
<param name="exclude">.git</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.REjsig/_old 2021-03-30 20:53:25.072252034 +0200
+++ /var/tmp/diff_new_pack.REjsig/_new 2021-03-30 20:53:25.076252038 +0200
@@ -3,4 +3,4 @@
<param
name="url">https://github.com/terraform-providers/terraform-provider-vsphere.git</param>
<param
name="changesrevision">d5727b8bf01dbfa755b356d7a7e3a1eba78f49ce</param></service><service
name="tar_scm">
<param
name="url">https://github.com/hashicorp/terraform-provider-vsphere.git</param>
- <param
name="changesrevision">5f45e900bd08477dfab8576393adafb62d49cc89</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">62eec9aa9d013d741ef747108f069330c3118a48</param></service></servicedata>
\ No newline at end of file
++++++ terraform-provider-vsphere-1.24.1.obscpio ->
terraform-provider-vsphere-1.24.3.obscpio ++++++
/work/SRC/openSUSE:Factory/terraform-provider-vsphere/terraform-provider-vsphere-1.24.1.obscpio
/work/SRC/openSUSE:Factory/.terraform-provider-vsphere.new.2401/terraform-provider-vsphere-1.24.3.obscpio
differ: char 49, line 1
++++++ terraform-provider-vsphere-1.24.1.tar.xz ->
terraform-provider-vsphere-1.24.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/.circleci/config.yml
new/terraform-provider-vsphere-1.24.3/.circleci/config.yml
--- old/terraform-provider-vsphere-1.24.1/.circleci/config.yml 2020-10-07
19:01:40.000000000 +0200
+++ new/terraform-provider-vsphere-1.24.3/.circleci/config.yml 2020-12-14
20:21:10.000000000 +0100
@@ -1,8 +1,13 @@
version: 2
+
+references:
+ images:
+ go: &GOLANG_IMAGE
docker.mirror.hashicorp.services/circleci/circleci/golang:1.13
+
jobs:
build:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory: ~/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -28,7 +33,7 @@
make build
linters:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
$GOPATH/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -44,7 +49,7 @@
tfproviderlint -AT00{1..3} -R00{2..4} -S0{{01..12},{14..19}} ./...
revert_snapshot:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
$GOPATH/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -65,7 +70,7 @@
$GOPATH/src/github.com/hashicorp/terraform-provider-vsphere/scripts/revert_snapshot.sh
test_acc_Client:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -93,7 +98,7 @@
test_acc_DataSourceVSphereComputeCluster:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -121,7 +126,7 @@
test_acc_DataSourceVSphereCustomAttribute:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -149,7 +154,7 @@
test_acc_DataSourceVSphereDatacenter:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -177,7 +182,7 @@
test_acc_DataSourceVSphereDatastore:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -205,7 +210,7 @@
test_acc_DataSourceVSphereDatastoreCluster:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -233,7 +238,7 @@
test_acc_DataSourceVSphereDistributedVirtualSwitch:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -261,7 +266,7 @@
test_acc_DataSourceVSphereFolder:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -289,7 +294,7 @@
test_acc_DataSourceVSphereHost:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -317,7 +322,7 @@
test_acc_DataSourceVSphereNetwork:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -345,7 +350,7 @@
test_acc_DataSourceVSphereResourcePool:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -373,7 +378,7 @@
test_acc_DataSourceVSphereTag:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -401,7 +406,7 @@
test_acc_DataSourceVSphereTagCategory:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -429,7 +434,7 @@
test_acc_DataSourceVSphereVAppContainer:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -457,7 +462,7 @@
test_acc_DataSourceVSphereVirtualMachine:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -485,7 +490,7 @@
test_acc_DataSourceVSphereVmfsDisks:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -513,7 +518,7 @@
test_acc_ResourceVSphereComputeCluster:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -541,7 +546,7 @@
test_acc_ResourceVSphereComputeClusterHostGroup:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -569,7 +574,7 @@
test_acc_ResourceVSphereComputeClusterVMAffinityRule:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -597,7 +602,7 @@
test_acc_ResourceVSphereComputeClusterVMAntiAffinityRule:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -625,7 +630,7 @@
test_acc_ResourceVSphereComputeClusterVMDependencyRule:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -653,7 +658,7 @@
test_acc_ResourceVSphereComputeClusterVMGroup:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -681,7 +686,7 @@
test_acc_ResourceVSphereComputeClusterVMHostRule:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -709,7 +714,7 @@
test_acc_ResourceVSphereCustomAttribute:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -737,7 +742,7 @@
test_acc_ResourceVSphereDatacenter:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -765,7 +770,7 @@
test_acc_ResourceVSphereDatastoreCluster:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -793,7 +798,7 @@
test_acc_ResourceVSphereDatastoreClusterVMAntiAffinityRule:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -821,7 +826,7 @@
test_acc_ResourceVSphereDistributedPortGroup:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -849,7 +854,7 @@
test_acc_ResourceVSphereDistributedVirtualSwitch:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -877,7 +882,7 @@
test_acc_ResourceVSphereDPMHostOverride:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -905,7 +910,7 @@
test_acc_ResourceVSphereDRSVMOverride:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -933,7 +938,7 @@
test_acc_ResourceVSphereFile:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -961,7 +966,7 @@
test_acc_ResourceVSphereFolder:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -989,7 +994,7 @@
test_acc_ResourceVSphereHAVMOverride:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1017,7 +1022,7 @@
test_acc_ResourceVSphereHost:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1045,7 +1050,7 @@
test_acc_ResourceVSphereHostPortGroup:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1073,7 +1078,7 @@
test_acc_ResourceVSphereHostVirtualSwitch:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1101,7 +1106,7 @@
test_acc_ResourceVSphereLicense:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1129,7 +1134,7 @@
test_acc_ResourceVSphereNasDatastore:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1157,7 +1162,7 @@
test_acc_ResourceVSphereResourcePool:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1185,7 +1190,7 @@
test_acc_ResourceVSphereStorageDrsVMOverride:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1213,7 +1218,7 @@
test_acc_ResourceVSphereTag:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1241,7 +1246,7 @@
test_acc_ResourceVSphereTagCategory:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1269,7 +1274,7 @@
test_acc_ResourceVSphereVAppContainer:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1297,7 +1302,7 @@
test_acc_ResourceVSphereVAppEntity:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1325,7 +1330,7 @@
test_acc_ResourceVSphereVirtualDisk:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1353,7 +1358,7 @@
test_acc_ResourceVSphereVirtualMachine:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1381,7 +1386,7 @@
test_acc_ResourceVSphereVirtualMachineSnapshot:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
@@ -1409,7 +1414,7 @@
test_acc_ResourceVSphereVmfsDatastore:
docker:
- - image: circleci/golang:1.13
+ - image: *GOLANG_IMAGE
working_directory:
/home/circleci/src/github.com/hashicorp/terraform-provider-vsphere
steps:
- checkout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/.github/workflows/prune_stale_issues.yml
new/terraform-provider-vsphere-1.24.3/.github/workflows/prune_stale_issues.yml
---
old/terraform-provider-vsphere-1.24.1/.github/workflows/prune_stale_issues.yml
2020-10-07 19:01:40.000000000 +0200
+++
new/terraform-provider-vsphere-1.24.3/.github/workflows/prune_stale_issues.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-name: "Close stale issues"
-on:
- schedule:
- - cron: "0 0 * * *"
-
-jobs:
- stale:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/[email protected]
- with:
- repo-token: ${{ secrets.vsphere_github_actions }}
- stale-issue-message: 'This issue has been open 180 days with no
activity. If this issue is reproducible with the latest version of the provider
and with Terraform 0.12, please comment. Otherwise this issue will be closed in
30 days.'
- days-before-stale: 180
- days-before-close: 30
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terraform-provider-vsphere-1.24.1/CHANGELOG.md
new/terraform-provider-vsphere-1.24.3/CHANGELOG.md
--- old/terraform-provider-vsphere-1.24.1/CHANGELOG.md 2020-10-07
19:01:40.000000000 +0200
+++ new/terraform-provider-vsphere-1.24.3/CHANGELOG.md 2020-12-14
20:21:10.000000000 +0100
@@ -1,3 +1,14 @@
+## 1.24.3 (December 14, 2020)
+
+BUG FIXES:
+* `resource/vm`: Support for no disks in config
([#1241](https://github.com/hashicorp/terraform-provider-vsphere/1241))
+* `resource/vm`: Make API timeout configurable when building VMs
([#1278](https://github.com/hashicorp/terraform-provider-vsphere/1278))
+
+## 1.24.2 (October 16, 2020)
+
+BUG FIXES:
+* `resource/vm`: Prevent guest_id nil condition.
([#1234](https://github.com/hashicorp/terraform-provider-vsphere/pull/1234))
+
## 1.24.1 (October 07, 2020)
IMPROVEMENTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/terraform-provider-vsphere-1.24.1/vsphere/config.go
new/terraform-provider-vsphere-1.24.3/vsphere/config.go
--- old/terraform-provider-vsphere-1.24.1/vsphere/config.go 2020-10-07
19:01:40.000000000 +0200
+++ new/terraform-provider-vsphere-1.24.3/vsphere/config.go 2020-12-14
20:21:10.000000000 +0100
@@ -40,6 +40,9 @@
// The REST client used for tags and content library.
restClient *rest.Client
+
+ // client timeout for certain operations
+ timeout time.Duration
}
// TagsManager returns the embedded tags manager used for tags, after
determining
@@ -87,6 +90,7 @@
VimSessionPath string
RestSessionPath string
KeepAlive int
+ ApiTimeout time.Duration
}
// NewConfig returns a new Config from a supplied ResourceData.
@@ -104,6 +108,9 @@
return nil, fmt.Errorf("one of vsphere_server or [deprecated]
vcenter_server must be provided")
}
+ timeoutCfg := time.Duration(d.Get("api_timeout").(int))
+ timeout := time.Duration(timeoutCfg * time.Minute)
+
c := &Config{
User: d.Get("user").(string),
Password: d.Get("password").(string),
@@ -116,6 +123,7 @@
VimSessionPath: d.Get("vim_session_path").(string),
RestSessionPath: d.Get("rest_session_path").(string),
KeepAlive: d.Get("vim_keep_alive").(int),
+ ApiTimeout: timeout,
}
return c, nil
@@ -195,6 +203,8 @@
return nil, fmt.Errorf("error persisting REST session to disk:
%s", err)
}
+ client.timeout = c.ApiTimeout
+
return client, nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/vsphere/internal/helper/storagepod/storage_pod_helper.go
new/terraform-provider-vsphere-1.24.3/vsphere/internal/helper/storagepod/storage_pod_helper.go
---
old/terraform-provider-vsphere-1.24.1/vsphere/internal/helper/storagepod/storage_pod_helper.go
2020-10-07 19:01:40.000000000 +0200
+++
new/terraform-provider-vsphere-1.24.3/vsphere/internal/helper/storagepod/storage_pod_helper.go
2020-12-14 20:21:10.000000000 +0100
@@ -195,6 +195,7 @@
pool *object.ResourcePool,
host *object.HostSystem,
pod *object.StoragePod,
+ timeout time.Duration,
) (*object.VirtualMachine, error) {
sdrsEnabled, err := StorageDRSEnabled(pod)
if err != nil {
@@ -222,7 +223,7 @@
sps.Host = types.NewReference(host.Reference())
}
- placement, err := recommendSDRS(client, sps, provider.DefaultAPITimeout)
+ placement, err := recommendSDRS(client, sps, timeout)
if err != nil {
return nil, err
}
@@ -234,12 +235,12 @@
case viapi.IsManagedObjectNotFoundError(err):
// This isn't a vApp container, so continue with normal
SDRS work flow.
case err == nil:
- return createVAppVMFromSPS(client, placement, spec,
sps, vc)
+ return createVAppVMFromSPS(client, placement, spec,
sps, vc, timeout)
default:
return nil, err
}
}
- return applySDRS(client, placement, provider.DefaultAPITimeout)
+ return applySDRS(client, placement, timeout)
}
// CloneVM clones a virtual machine to a datastore cluster via the
@@ -428,6 +429,7 @@
spec types.VirtualMachineConfigSpec,
sps types.StoragePlacementSpec,
vc *object.VirtualApp,
+ timeout time.Duration,
) (*object.VirtualMachine, error) {
ds, err := datastore.FromID(client,
placement.Recommendations[0].Action[0].(*types.StoragePlacementAction).Destination.Reference().Value)
if err != nil {
@@ -441,7 +443,7 @@
if err != nil {
return nil, err
}
- return virtualmachine.Create(client, f, spec, vc.ResourcePool, nil)
+ return virtualmachine.Create(client, f, spec, vc.ResourcePool, nil,
timeout)
}
// HasDiskCreationOperations is an exported function that checks a list of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/vsphere/internal/helper/virtualmachine/virtual_machine_helper.go
new/terraform-provider-vsphere-1.24.3/vsphere/internal/helper/virtualmachine/virtual_machine_helper.go
---
old/terraform-provider-vsphere-1.24.1/vsphere/internal/helper/virtualmachine/virtual_machine_helper.go
2020-10-07 19:01:40.000000000 +0200
+++
new/terraform-provider-vsphere-1.24.3/vsphere/internal/helper/virtualmachine/virtual_machine_helper.go
2020-12-14 20:21:10.000000000 +0100
@@ -493,9 +493,10 @@
// Create wraps the creation of a virtual machine and the subsequent waiting of
// the task. A higher-level virtual machine object is returned.
-func Create(c *govmomi.Client, f *object.Folder, s
types.VirtualMachineConfigSpec, p *object.ResourcePool, h *object.HostSystem)
(*object.VirtualMachine, error) {
+func Create(c *govmomi.Client, f *object.Folder, s
types.VirtualMachineConfigSpec, p *object.ResourcePool,
+ h *object.HostSystem, timeout time.Duration) (*object.VirtualMachine,
error) {
log.Printf("[DEBUG] Creating virtual machine %q", fmt.Sprintf("%s/%s",
f.InventoryPath, s.Name))
- ctx, cancel := context.WithTimeout(context.Background(),
provider.DefaultAPITimeout)
+ ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
var task *object.Task
// Check to see if the resource pool is a vApp
@@ -511,7 +512,7 @@
if err != nil {
return nil, err
}
- tctx, tcancel := context.WithTimeout(context.Background(),
provider.DefaultAPITimeout)
+ tctx, tcancel := context.WithTimeout(context.Background(), timeout)
defer tcancel()
result, err := task.WaitForResult(tctx, nil)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go
new/terraform-provider-vsphere-1.24.3/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go
---
old/terraform-provider-vsphere-1.24.1/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go
2020-10-07 19:01:40.000000000 +0200
+++
new/terraform-provider-vsphere-1.24.3/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go
2020-12-14 20:21:10.000000000 +0100
@@ -1005,7 +1005,10 @@
log.Printf("[DEBUG] DiskPostCloneOperation: Looking for and applying
device changes in source disks")
for i, device := range devices {
- src := curSet[i].(map[string]interface{})
+ src := map[string]interface{}{}
+ if i < len(curSet) {
+ src = curSet[i].(map[string]interface{})
+ }
vd := device.GetVirtualDevice()
ctlr := l.FindByKey(vd.ControllerKey)
if ctlr == nil {
@@ -1060,15 +1063,17 @@
}
// Any disk past the current device list is a new device. Create those
now.
- for _, ni := range curSet[len(devices):] {
- r := NewDiskSubresource(c, d, ni.(map[string]interface{}), nil,
len(updates))
- cspec, err := r.Create(l)
- if err != nil {
- return nil, nil, fmt.Errorf("%s: %s", r.Addr(), err)
+ if len(devices) <= len(curSet) {
+ for _, ni := range curSet[len(devices):] {
+ r := NewDiskSubresource(c, d,
ni.(map[string]interface{}), nil, len(updates))
+ cspec, err := r.Create(l)
+ if err != nil {
+ return nil, nil, fmt.Errorf("%s: %s", r.Addr(),
err)
+ }
+ l = applyDeviceChange(l, cspec)
+ spec = append(spec, cspec...)
+ updates = append(updates, r.Data())
}
- l = applyDeviceChange(l, cspec)
- spec = append(spec, cspec...)
- updates = append(updates, r.Data())
}
log.Printf("[DEBUG] DiskPostCloneOperation: Post-clone final resource
list: %s", subresourceListString(updates))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/vsphere/provider.go
new/terraform-provider-vsphere-1.24.3/vsphere/provider.go
--- old/terraform-provider-vsphere-1.24.1/vsphere/provider.go 2020-10-07
19:01:40.000000000 +0200
+++ new/terraform-provider-vsphere-1.24.3/vsphere/provider.go 2020-12-14
20:21:10.000000000 +0100
@@ -91,6 +91,12 @@
DefaultFunc:
schema.EnvDefaultFunc("VSPHERE_VIM_KEEP_ALIVE", 10),
Description: "Keep alive interval for the VIM
session in minutes",
},
+ "api_timeout": {
+ Type: schema.TypeInt,
+ Optional: true,
+ DefaultFunc:
schema.EnvDefaultFunc("VSPHERE_API_TIMEOUT", 5),
+ Description: "API timeout in minutes (Default:
5)",
+ },
},
ResourcesMap: map[string]*schema.Resource{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/vsphere/resource_vsphere_virtual_machine.go
new/terraform-provider-vsphere-1.24.3/vsphere/resource_vsphere_virtual_machine.go
---
old/terraform-provider-vsphere-1.24.1/vsphere/resource_vsphere_virtual_machine.go
2020-10-07 19:01:40.000000000 +0200
+++
new/terraform-provider-vsphere-1.24.3/vsphere/resource_vsphere_virtual_machine.go
2020-12-14 20:21:10.000000000 +0100
@@ -1208,11 +1208,11 @@
// environment info in the resource pool, which we can then filter
through
// our device CRUD lifecycles to get a full deviceChange attribute for
our
// configspec.
- var guestID interface{}
- if _, ok := d.GetOk("guest_id"); !ok {
- guestID = "other-64"
+ guestID := "other-64"
+ if guestInterface, ok := d.GetOk("guest_id"); ok {
+ guestID = guestInterface.(string)
}
- devices, err := resourcepool.DefaultDevices(client, pool,
guestID.(string))
+ devices, err := resourcepool.DefaultDevices(client, pool, guestID)
if err != nil {
return nil, fmt.Errorf("error loading default device list: %s",
err)
}
@@ -1278,7 +1278,8 @@
return nil, fmt.Errorf("error getting datastore cluster: %s",
err)
}
- vm, err := storagepod.CreateVM(client, fo, spec, pool, hs, pod)
+ timeout := meta.(*VSphereClient).timeout
+ vm, err := storagepod.CreateVM(client, fo, spec, pool, hs, pod, timeout)
if err != nil {
return nil, fmt.Errorf("error creating virtual machine on
datastore cluster %q: %s", pod.Name(), err)
}
@@ -1307,7 +1308,8 @@
VmPathName: fmt.Sprintf("[%s]", ds.Name()),
}
- vm, err := virtualmachine.Create(client, fo, spec, pool, hs)
+ timeout := meta.(*VSphereClient).timeout
+ vm, err := virtualmachine.Create(client, fo, spec, pool, hs, timeout)
if err != nil {
return nil, fmt.Errorf("error creating virtual machine: %s",
err)
}
@@ -1690,7 +1692,7 @@
return
fmt.Errorf(formatVirtualMachineCustomizationWaitError, vm.InventoryPath, err)
}
}
- return resourceVSphereVirtualMachineRead(d, meta)
+ return nil
}
// resourceVSphereVirtualMachineCreateCloneWithSDRS runs the clone part of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/terraform-provider-vsphere-1.24.1/website/docs/index.html.markdown
new/terraform-provider-vsphere-1.24.3/website/docs/index.html.markdown
--- old/terraform-provider-vsphere-1.24.1/website/docs/index.html.markdown
2020-10-07 19:01:40.000000000 +0200
+++ new/terraform-provider-vsphere-1.24.3/website/docs/index.html.markdown
2020-12-14 20:21:10.000000000 +0100
@@ -115,6 +115,9 @@
10 minutes to ensure that operations that take a longer than 30 minutes
without API interaction do not result in a session timeout. Can also be
specified with the `VSPHERE_VIM_KEEP_ALIVE` environment variable.
+* `api_timeout` - (Optional) Sets the number of minutes to wait for operations
+ to complete. The default timeout is 5 minutes. Currently it will override
+ the timeout for all VM creation operations.
### Session persistence options
++++++ terraform-provider-vsphere.obsinfo ++++++
--- /var/tmp/diff_new_pack.REjsig/_old 2021-03-30 20:53:26.636253787 +0200
+++ /var/tmp/diff_new_pack.REjsig/_new 2021-03-30 20:53:26.640253791 +0200
@@ -1,5 +1,5 @@
name: terraform-provider-vsphere
-version: 1.24.1
-mtime: 1602090100
-commit: 5f45e900bd08477dfab8576393adafb62d49cc89
+version: 1.24.3
+mtime: 1607973670
+commit: 62eec9aa9d013d741ef747108f069330c3118a48
