Skip to content

Commit a51db59

Browse files
sagarpsalviRohan
sagarpsalvi
and
Rohan
authored
Auto updated assets for terraform 22.1.5 (#563)
* Updated assets for terraform Signed-off-by: Sagar <[email protected]> * Fixed CI Failure * Updated golangci-lint version * Updated assets for terraform Signed-off-by: Sagar <[email protected]> * Updated golangci-lint version * Formatted go code * Fixed goimport issue --------- Signed-off-by: Sagar <[email protected]> Co-authored-by: Rohan <[email protected]>
1 parent d2b6bba commit a51db59

File tree

131 files changed

+701
-1626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+701
-1626
lines changed

Diff for: ‎.github/workflows/golangci-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- name: golangci-lint
1515
uses: golangci/golangci-lint-action@v2
1616
with:
17-
version: v1.48.0
18-
args: -h --issues-exit-code=1
17+
version: v1.54.2
18+
args: --issues-exit-code=1
1919
only-new-issues: true
2020
skip-pkg-cache: true
2121
skip-build-cache: true

Diff for: ‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
name: golangci-lint
2323
uses: golangci/golangci-lint-action@v2
2424
with:
25-
version: v1.48.0
26-
args: -h --issues-exit-code=1
25+
version: v1.53.3
26+
args: --issues-exit-code=1
2727
skip-pkg-cache: true
2828
skip-build-cache: true
2929
-

Diff for: ‎.golangci.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ issues:
22
max-per-linter: 0
33
max-same-issues: 0
44
exclude:
5-
- SA1019
5+
- SA1019
66

77
run:
88
deadline: 5m
@@ -12,23 +12,18 @@ run:
1212
linters:
1313
disable-all: true
1414
enable:
15-
- deadcode
1615
- errcheck
1716
- gofmt
1817
- goimports
19-
- golint
2018
- gosimple
2119
- govet
2220
- ineffassign
23-
- interfacer
2421
- nakedret
2522
- misspell
2623
- staticcheck
27-
- structcheck
2824
- typecheck
2925
- unused
3026
- unconvert
31-
- varcheck
3227
- vet
3328
- vetshadow
3429

Diff for: ‎avi/data_source_avi_customipamdnsprofile_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAVIDataSourceCustomIpamDnsProfileBasic(t *testing.T) {
2626

2727
}
2828

29-
//nolint
29+
// nolint
3030
const testAccAVIDSCustomIpamDnsProfileConfig = `
3131
data "avi_tenant" "default_tenant"{
3232
name= "admin"

Diff for: ‎avi/data_source_avi_dnspolicy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAVIDataSourceDnsPolicyBasic(t *testing.T) {
2626

2727
}
2828

29-
//nolint
29+
// nolint
3030
const testAccAVIDSDnsPolicyConfig = `
3131
data "avi_tenant" "default_tenant"{
3232
name= "admin"

Diff for: ‎avi/data_source_avi_ipaddrgroup_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAVIDataSourceIpAddrGroupBasic(t *testing.T) {
2626

2727
}
2828

29-
//nolint
29+
// nolint
3030
const testAccAVIDSIpAddrGroupConfig = `
3131
data "avi_tenant" "default_tenant"{
3232
name= "admin"

Diff for: ‎avi/data_source_avi_ipamdnsproviderprofile_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAVIDataSourceIpamDnsProviderProfileBasic(t *testing.T) {
2828

2929
}
3030

31-
//nolint
31+
// nolint
3232
const testAccAVIDSIpamDnsProviderProfileConfig = `
3333
data "avi_tenant" "default_tenant"{
3434
name= "admin"

Diff for: ‎avi/datasource_avi_customipamdnsprofile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package avi
55

66
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
77

8-
//nolint
8+
// nolint
99
func dataSourceAviCustomIpamDnsProfile() *schema.Resource {
1010
return &schema.Resource{
1111
Read: ResourceAviCustomIpamDnsProfileRead,

Diff for: ‎avi/datasource_avi_dnspolicy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package avi
55

66
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
77

8-
//nolint
8+
// nolint
99
func dataSourceAviDnsPolicy() *schema.Resource {
1010
return &schema.Resource{
1111
Read: ResourceAviDnsPolicyRead,

Diff for: ‎avi/datasource_avi_dynamicdnsrecord.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package avi
55

66
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
77

8-
//nolint
8+
// nolint
99
func dataSourceAviDynamicDnsRecord() *schema.Resource {
1010
return &schema.Resource{
1111
Read: ResourceAviDynamicDnsRecordRead,

Diff for: ‎avi/datasource_avi_ipaddrgroup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package avi
55

66
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
77

8-
//nolint
8+
// nolint
99
func dataSourceAviIpAddrGroup() *schema.Resource {
1010
return &schema.Resource{
1111
Read: ResourceAviIpAddrGroupRead,

Diff for: ‎avi/datasource_avi_ipamdnsproviderprofile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package avi
55

66
import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
77

8-
//nolint
8+
// nolint
99
func dataSourceAviIpamDnsProviderProfile() *schema.Resource {
1010
return &schema.Resource{
1111
Read: ResourceAviIpamDnsProviderProfileRead,

Diff for: ‎avi/resource_avi_actiongroupconfig.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceActionGroupConfigSchema() map[string]*schema.Schema {
@@ -123,20 +121,13 @@ func resourceAviActionGroupConfigUpdate(d *schema.ResourceData, meta interface{}
123121
}
124122

125123
func resourceAviActionGroupConfigDelete(d *schema.ResourceData, meta interface{}) error {
126-
objType := "actiongroupconfig"
127-
client := meta.(*clients.AviClient)
124+
var err error
128125
if APIDeleteSystemDefaultCheck(d) {
129126
return nil
130127
}
131-
uuid := d.Get("uuid").(string)
132-
if uuid != "" {
133-
path := "api/" + objType + "/" + uuid
134-
err := client.AviSession.Delete(path)
135-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
136-
log.Println("[INFO] resourceAviActionGroupConfigDelete not found")
137-
return err
138-
}
139-
d.SetId("")
128+
err = APIDelete(d, meta, "actiongroupconfig")
129+
if err != nil {
130+
log.Printf("[ERROR] in deleting object %v\n", err)
140131
}
141-
return nil
132+
return err
142133
}

Diff for: ‎avi/resource_avi_albservicesconfig.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceALBServicesConfigSchema() map[string]*schema.Schema {
@@ -153,20 +151,13 @@ func resourceAviALBServicesConfigUpdate(d *schema.ResourceData, meta interface{}
153151
}
154152

155153
func resourceAviALBServicesConfigDelete(d *schema.ResourceData, meta interface{}) error {
156-
objType := "albservicesconfig"
157-
client := meta.(*clients.AviClient)
154+
var err error
158155
if APIDeleteSystemDefaultCheck(d) {
159156
return nil
160157
}
161-
uuid := d.Get("uuid").(string)
162-
if uuid != "" {
163-
path := "api/" + objType + "/" + uuid
164-
err := client.AviSession.Delete(path)
165-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
166-
log.Println("[INFO] resourceAviALBServicesConfigDelete not found")
167-
return err
168-
}
169-
d.SetId("")
158+
err = APIDelete(d, meta, "albservicesconfig")
159+
if err != nil {
160+
log.Printf("[ERROR] in deleting object %v\n", err)
170161
}
171-
return nil
162+
return err
172163
}

Diff for: ‎avi/resource_avi_albservicesfileupload.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceALBServicesFileUploadSchema() map[string]*schema.Schema {
@@ -101,20 +99,13 @@ func resourceAviALBServicesFileUploadUpdate(d *schema.ResourceData, meta interfa
10199
}
102100

103101
func resourceAviALBServicesFileUploadDelete(d *schema.ResourceData, meta interface{}) error {
104-
objType := "albservicesfileupload"
105-
client := meta.(*clients.AviClient)
102+
var err error
106103
if APIDeleteSystemDefaultCheck(d) {
107104
return nil
108105
}
109-
uuid := d.Get("uuid").(string)
110-
if uuid != "" {
111-
path := "api/" + objType + "/" + uuid
112-
err := client.AviSession.Delete(path)
113-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
114-
log.Println("[INFO] resourceAviALBServicesFileUploadDelete not found")
115-
return err
116-
}
117-
d.SetId("")
106+
err = APIDelete(d, meta, "albservicesfileupload")
107+
if err != nil {
108+
log.Printf("[ERROR] in deleting object %v\n", err)
118109
}
119-
return nil
110+
return err
120111
}

Diff for: ‎avi/resource_avi_albservicesjob.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceALBServicesJobSchema() map[string]*schema.Schema {
@@ -130,20 +128,13 @@ func resourceAviALBServicesJobUpdate(d *schema.ResourceData, meta interface{}) e
130128
}
131129

132130
func resourceAviALBServicesJobDelete(d *schema.ResourceData, meta interface{}) error {
133-
objType := "albservicesjob"
134-
client := meta.(*clients.AviClient)
131+
var err error
135132
if APIDeleteSystemDefaultCheck(d) {
136133
return nil
137134
}
138-
uuid := d.Get("uuid").(string)
139-
if uuid != "" {
140-
path := "api/" + objType + "/" + uuid
141-
err := client.AviSession.Delete(path)
142-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
143-
log.Println("[INFO] resourceAviALBServicesJobDelete not found")
144-
return err
145-
}
146-
d.SetId("")
135+
err = APIDelete(d, meta, "albservicesjob")
136+
if err != nil {
137+
log.Printf("[ERROR] in deleting object %v\n", err)
147138
}
148-
return nil
139+
return err
149140
}

Diff for: ‎avi/resource_avi_alertconfig.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceAlertConfigSchema() map[string]*schema.Schema {
@@ -162,20 +160,13 @@ func resourceAviAlertConfigUpdate(d *schema.ResourceData, meta interface{}) erro
162160
}
163161

164162
func resourceAviAlertConfigDelete(d *schema.ResourceData, meta interface{}) error {
165-
objType := "alertconfig"
166-
client := meta.(*clients.AviClient)
163+
var err error
167164
if APIDeleteSystemDefaultCheck(d) {
168165
return nil
169166
}
170-
uuid := d.Get("uuid").(string)
171-
if uuid != "" {
172-
path := "api/" + objType + "/" + uuid
173-
err := client.AviSession.Delete(path)
174-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
175-
log.Println("[INFO] resourceAviAlertConfigDelete not found")
176-
return err
177-
}
178-
d.SetId("")
167+
err = APIDelete(d, meta, "alertconfig")
168+
if err != nil {
169+
log.Printf("[ERROR] in deleting object %v\n", err)
179170
}
180-
return nil
171+
return err
181172
}

Diff for: ‎avi/resource_avi_alertemailconfig.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceAlertEmailConfigSchema() map[string]*schema.Schema {
@@ -97,20 +95,13 @@ func resourceAviAlertEmailConfigUpdate(d *schema.ResourceData, meta interface{})
9795
}
9896

9997
func resourceAviAlertEmailConfigDelete(d *schema.ResourceData, meta interface{}) error {
100-
objType := "alertemailconfig"
101-
client := meta.(*clients.AviClient)
98+
var err error
10299
if APIDeleteSystemDefaultCheck(d) {
103100
return nil
104101
}
105-
uuid := d.Get("uuid").(string)
106-
if uuid != "" {
107-
path := "api/" + objType + "/" + uuid
108-
err := client.AviSession.Delete(path)
109-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
110-
log.Println("[INFO] resourceAviAlertEmailConfigDelete not found")
111-
return err
112-
}
113-
d.SetId("")
102+
err = APIDelete(d, meta, "alertemailconfig")
103+
if err != nil {
104+
log.Printf("[ERROR] in deleting object %v\n", err)
114105
}
115-
return nil
106+
return err
116107
}

Diff for: ‎avi/resource_avi_alertscriptconfig.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ package avi
55

66
import (
77
"log"
8-
"strings"
98

109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
11-
"github.com/vmware/alb-sdk/go/clients"
1210
)
1311

1412
func ResourceAlertScriptConfigSchema() map[string]*schema.Schema {
@@ -88,20 +86,13 @@ func resourceAviAlertScriptConfigUpdate(d *schema.ResourceData, meta interface{}
8886
}
8987

9088
func resourceAviAlertScriptConfigDelete(d *schema.ResourceData, meta interface{}) error {
91-
objType := "alertscriptconfig"
92-
client := meta.(*clients.AviClient)
89+
var err error
9390
if APIDeleteSystemDefaultCheck(d) {
9491
return nil
9592
}
96-
uuid := d.Get("uuid").(string)
97-
if uuid != "" {
98-
path := "api/" + objType + "/" + uuid
99-
err := client.AviSession.Delete(path)
100-
if err != nil && !(strings.Contains(err.Error(), "404") || strings.Contains(err.Error(), "204") || strings.Contains(err.Error(), "403")) {
101-
log.Println("[INFO] resourceAviAlertScriptConfigDelete not found")
102-
return err
103-
}
104-
d.SetId("")
93+
err = APIDelete(d, meta, "alertscriptconfig")
94+
if err != nil {
95+
log.Printf("[ERROR] in deleting object %v\n", err)
10596
}
106-
return nil
97+
return err
10798
}

0 commit comments

Comments
 (0)