IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors with gofmt compliance

Browse Source
This commit is contained in:
James Nugent 2015-12-17 12:24:24 -05:00
parent 6d6487e288
commit 8e538b68ec
9 changed files with 67 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/resource_aws_db_instance_test.go
View File

@ -191,7 +191,7 @@ func testAccCheckAWSDBInstanceSnapshot(s *terraform.State) error {
} else { } else {
if len(resp.DBInstances) != 0 && if len(resp.DBInstances) != 0 &&
*resp.DBInstances[0].DBInstanceIdentifier == rs.Primary.ID { *resp.DBInstances[0].DBInstanceIdentifier == rs.Primary.ID {
return fmt.Errorf("DB Instance still exists") return fmt.Errorf("DB Instance still exists")
} }
} }
@ -245,7 +245,7 @@ func testAccCheckAWSDBInstanceNoSnapshot(s *terraform.State) error {
} else { } else {
if len(resp.DBInstances) != 0 && if len(resp.DBInstances) != 0 &&
*resp.DBInstances[0].DBInstanceIdentifier == rs.Primary.ID { *resp.DBInstances[0].DBInstanceIdentifier == rs.Primary.ID {
return fmt.Errorf("DB Instance still exists") return fmt.Errorf("DB Instance still exists")
} }
} }

18
builtin/providers/aws/resource_aws_dynamodb_table.go
View File

@ -160,12 +160,12 @@ func resourceAwsDynamoDbTable() *schema.Resource {
}, },
}, },
"stream_enabled": &schema.Schema{ "stream_enabled": &schema.Schema{
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Computed: true, Computed: true,
}, },
"stream_view_type": &schema.Schema{ "stream_view_type": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true, Computed: true,
StateFunc: func(v interface{}) string { StateFunc: func(v interface{}) string {
@ -280,9 +280,9 @@ func resourceAwsDynamoDbTableCreate(d *schema.ResourceData, meta interface{}) er
} }
if _, ok := d.GetOk("stream_enabled"); ok { if _, ok := d.GetOk("stream_enabled"); ok {
req.StreamSpecification = &dynamodb.StreamSpecification{ req.StreamSpecification = &dynamodb.StreamSpecification{
StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)), StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)),
StreamViewType: aws.String(d.Get("stream_view_type").(string)), StreamViewType: aws.String(d.Get("stream_view_type").(string)),
} }
@ -372,7 +372,7 @@ func resourceAwsDynamoDbTableUpdate(d *schema.ResourceData, meta interface{}) er
} }
req.StreamSpecification = &dynamodb.StreamSpecification{ req.StreamSpecification = &dynamodb.StreamSpecification{
StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)), StreamEnabled: aws.Bool(d.Get("stream_enabled").(bool)),
StreamViewType: aws.String(d.Get("stream_view_type").(string)), StreamViewType: aws.String(d.Get("stream_view_type").(string)),
} }
@ -804,10 +804,10 @@ func waitForTableToBeActive(tableName string, meta interface{}) error {
func validateStreamViewType(v interface{}, k string) (ws []string, errors []error) { func validateStreamViewType(v interface{}, k string) (ws []string, errors []error) {
value := v.(string) value := v.(string)
viewTypes := map[string]bool { viewTypes := map[string]bool{
"KEYS_ONLY": true, "KEYS_ONLY": true,
"NEW_IMAGE": true, "NEW_IMAGE": true,
"OLD_IMAGE": true, "OLD_IMAGE": true,
"NEW_AND_OLD_IMAGES": true, "NEW_AND_OLD_IMAGES": true,
} }

8
builtin/providers/aws/resource_aws_security_group.go
View File

@ -24,10 +24,10 @@ func resourceAwsSecurityGroup() *schema.Resource {
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true, Computed: true,
ForceNew: true, ForceNew: true,
ConflictsWith: []string{"name_prefix"}, ConflictsWith: []string{"name_prefix"},
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
value := v.(string) value := v.(string)

4
builtin/providers/aws/resource_aws_security_group_test.go
View File

@ -46,7 +46,7 @@ func TestAccAWSSecurityGroup_basic(t *testing.T) {
}) })
} }
func TestAccAWSSecurityGroup_namePrefix( t *testing.T) { func TestAccAWSSecurityGroup_namePrefix(t *testing.T) {
var group ec2.SecurityGroup var group ec2.SecurityGroup
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
@ -345,7 +345,7 @@ func testAccCheckAWSSecurityGroupDestroy(s *terraform.State) error {
} }
func testAccCheckAWSSecurityGroupGeneratedNamePrefix( func testAccCheckAWSSecurityGroupGeneratedNamePrefix(
resource, prefix string) resource.TestCheckFunc { resource, prefix string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
r, ok := s.RootModule().Resources[resource] r, ok := s.RootModule().Resources[resource]
if !ok { if !ok {

2
builtin/providers/digitalocean/resource_digitalocean_record.go
View File

@ -183,7 +183,7 @@ func resourceDigitalOceanRecordDelete(d *schema.ResourceData, meta interface{})
log.Printf("[INFO] Deleting record: %s, %d", domain, id) log.Printf("[INFO] Deleting record: %s, %d", domain, id)
resp, delErr := client.Domains.DeleteRecord(domain, id) resp, delErr := client.Domains.DeleteRecord(domain, id)
if delErr != nil { if delErr != nil {
// If the record is somehow already destroyed, mark as // If the record is somehow already destroyed, mark as
// successfully gone // successfully gone

50
builtin/providers/vsphere/resource_vsphere_folder.go
View File

@ -14,9 +14,9 @@ import (
) )
type folder struct { type folder struct {
datacenter string datacenter string
existingPath string existingPath string
path string path string
} }
func resourceVSphereFolder() *schema.Resource { func resourceVSphereFolder() *schema.Resource {
@ -47,7 +47,7 @@ func resourceVSphereFolder() *schema.Resource {
} }
func resourceVSphereFolderCreate(d *schema.ResourceData, meta interface{}) error { func resourceVSphereFolderCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*govmomi.Client) client := meta.(*govmomi.Client)
f := folder{ f := folder{
@ -67,7 +67,6 @@ func resourceVSphereFolderCreate(d *schema.ResourceData, meta interface{}) error
return resourceVSphereFolderRead(d, meta) return resourceVSphereFolderRead(d, meta)
} }
func createFolder(client *govmomi.Client, f *folder) error { func createFolder(client *govmomi.Client, f *folder) error {
finder := find.NewFinder(client.Client, true) finder := find.NewFinder(client.Client, true)
@ -96,41 +95,40 @@ func createFolder(client *govmomi.Client, f *folder) error {
subfolder, err := si.FindByInventoryPath( subfolder, err := si.FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", f.datacenter, workingPath)) context.TODO(), fmt.Sprintf("%v/vm/%v", f.datacenter, workingPath))
if err != nil { if err != nil {
return fmt.Errorf("error %s", err) return fmt.Errorf("error %s", err)
} else if subfolder == nil { } else if subfolder == nil {
log.Printf("[DEBUG] folder not found; creating: %s", workingPath) log.Printf("[DEBUG] folder not found; creating: %s", workingPath)
folder, err = folder.CreateFolder(context.TODO(), pathPart) folder, err = folder.CreateFolder(context.TODO(), pathPart)
if err != nil { if err != nil {
return fmt.Errorf("Failed to create folder at %s; %s", workingPath, err) return fmt.Errorf("Failed to create folder at %s; %s", workingPath, err)
} }
} else { } else {
log.Printf("[DEBUG] folder already exists: %s", workingPath) log.Printf("[DEBUG] folder already exists: %s", workingPath)
f.existingPath = workingPath f.existingPath = workingPath
folder = subfolder.(*object.Folder) folder = subfolder.(*object.Folder)
} }
} }
return nil return nil
} }
func resourceVSphereFolderRead(d *schema.ResourceData, meta interface{}) error { func resourceVSphereFolderRead(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] reading folder: %#v", d) log.Printf("[DEBUG] reading folder: %#v", d)
client := meta.(*govmomi.Client) client := meta.(*govmomi.Client)
dc, err := getDatacenter(client, d.Get("datacenter").(string)) dc, err := getDatacenter(client, d.Get("datacenter").(string))
if err != nil { if err != nil {
return err return err
} }
finder := find.NewFinder(client.Client, true) finder := find.NewFinder(client.Client, true)
finder = finder.SetDatacenter(dc) finder = finder.SetDatacenter(dc)
folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath( folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", d.Get("datacenter").(string), context.TODO(), fmt.Sprintf("%v/vm/%v", d.Get("datacenter").(string),
d.Get("path").(string))) d.Get("path").(string)))
if err != nil { if err != nil {
return err return err
} }
@ -143,9 +141,9 @@ func resourceVSphereFolderRead(d *schema.ResourceData, meta interface{}) error {
} }
func resourceVSphereFolderDelete(d *schema.ResourceData, meta interface{}) error { func resourceVSphereFolderDelete(d *schema.ResourceData, meta interface{}) error {
f := folder{ f := folder{
path: strings.TrimRight(d.Get("path").(string), "/"), path: strings.TrimRight(d.Get("path").(string), "/"),
existingPath: d.Get("existing_path").(string), existingPath: d.Get("existing_path").(string),
} }
@ -156,7 +154,7 @@ func resourceVSphereFolderDelete(d *schema.ResourceData, meta interface{}) error
client := meta.(*govmomi.Client) client := meta.(*govmomi.Client)
deleteFolder(client, &f) deleteFolder(client, &f)
d.SetId("") d.SetId("")
return nil return nil
} }
@ -175,7 +173,7 @@ func deleteFolder(client *govmomi.Client, f *folder) error {
folderRef, err := si.FindByInventoryPath( folderRef, err := si.FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", f.datacenter, f.path)) context.TODO(), fmt.Sprintf("%v/vm/%v", f.datacenter, f.path))
if err != nil { if err != nil {
return fmt.Errorf("[ERROR] Could not locate folder %s: %v", f.path, err) return fmt.Errorf("[ERROR] Could not locate folder %s: %v", f.path, err)
} else { } else {

39
builtin/providers/vsphere/resource_vsphere_folder_test.go
View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"os" "os"
"testing" "testing"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
@ -21,7 +20,7 @@ func TestAccVSphereFolder_basic(t *testing.T) {
testMethod := "basic" testMethod := "basic"
resourceName := "vsphere_folder." + testMethod resourceName := "vsphere_folder." + testMethod
path := "tf_test_basic" path := "tf_test_basic"
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
@ -47,7 +46,7 @@ func TestAccVSphereFolder_basic(t *testing.T) {
} }
func TestAccVSphereFolder_nested(t *testing.T) { func TestAccVSphereFolder_nested(t *testing.T) {
var f folder var f folder
datacenter := os.Getenv("VSPHERE_DATACENTER") datacenter := os.Getenv("VSPHERE_DATACENTER")
testMethod := "nested" testMethod := "nested"
@ -79,7 +78,7 @@ func TestAccVSphereFolder_nested(t *testing.T) {
} }
func TestAccVSphereFolder_dontDeleteExisting(t *testing.T) { func TestAccVSphereFolder_dontDeleteExisting(t *testing.T) {
var f folder var f folder
datacenter := os.Getenv("VSPHERE_DATACENTER") datacenter := os.Getenv("VSPHERE_DATACENTER")
testMethod := "dontDeleteExisting" testMethod := "dontDeleteExisting"
@ -88,17 +87,17 @@ func TestAccVSphereFolder_dontDeleteExisting(t *testing.T) {
path := existingPath + "/tf_nested/tf_test" path := existingPath + "/tf_nested/tf_test"
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: resource.ComposeTestCheckFunc( CheckDestroy: resource.ComposeTestCheckFunc(
assertVSphereFolderExists(datacenter, existingPath), assertVSphereFolderExists(datacenter, existingPath),
removeVSphereFolder(datacenter, existingPath, ""), removeVSphereFolder(datacenter, existingPath, ""),
), ),
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
PreConfig: func() { PreConfig: func() {
createVSphereFolder(datacenter, existingPath) createVSphereFolder(datacenter, existingPath)
}, },
Config: fmt.Sprintf( Config: fmt.Sprintf(
testAccCheckVSphereFolderConfig, testAccCheckVSphereFolderConfig,
testMethod, testMethod,
@ -171,7 +170,6 @@ func testAccCheckVSphereFolderExists(n string, f *folder) resource.TestCheckFunc
_, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["path"]) _, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["path"])
*f = folder{ *f = folder{
path: rs.Primary.Attributes["path"], path: rs.Primary.Attributes["path"],
} }
@ -206,7 +204,6 @@ func testAccCheckVSphereFolderExistingPathExists(n string, f *folder) resource.T
_, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["existing_path"]) _, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["existing_path"])
*f = folder{ *f = folder{
path: rs.Primary.Attributes["path"], path: rs.Primary.Attributes["path"],
} }
@ -217,10 +214,10 @@ func testAccCheckVSphereFolderExistingPathExists(n string, f *folder) resource.T
func assertVSphereFolderExists(datacenter string, folder_name string) resource.TestCheckFunc { func assertVSphereFolderExists(datacenter string, folder_name string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
client := testAccProvider.Meta().(*govmomi.Client) client := testAccProvider.Meta().(*govmomi.Client)
folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath( folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name)) context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name))
if err != nil { if err != nil {
return fmt.Errorf("Error: %s", err) return fmt.Errorf("Error: %s", err)
} else if folder == nil { } else if folder == nil {
@ -232,16 +229,16 @@ func assertVSphereFolderExists(datacenter string, folder_name string) resource.T
} }
func createVSphereFolder(datacenter string, folder_name string) error { func createVSphereFolder(datacenter string, folder_name string) error {
client := testAccProvider.Meta().(*govmomi.Client) client := testAccProvider.Meta().(*govmomi.Client)
f := folder{path: folder_name, datacenter: datacenter,} f := folder{path: folder_name, datacenter: datacenter}
folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath( folder, err := object.NewSearchIndex(client.Client).FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name)) context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name))
if err != nil { if err != nil {
return fmt.Errorf("error %s", err) return fmt.Errorf("error %s", err)
} }
if folder == nil { if folder == nil {
createFolder(client, &f) createFolder(client, &f)
@ -253,16 +250,16 @@ func createVSphereFolder(datacenter string, folder_name string) error {
} }
func removeVSphereFolder(datacenter string, folder_name string, existing_path string) resource.TestCheckFunc { func removeVSphereFolder(datacenter string, folder_name string, existing_path string) resource.TestCheckFunc {
f := folder{path: folder_name, datacenter: datacenter, existingPath: existing_path,}
return func(s *terraform.State) error { f := folder{path: folder_name, datacenter: datacenter, existingPath: existing_path}
return func(s *terraform.State) error {
client := testAccProvider.Meta().(*govmomi.Client) client := testAccProvider.Meta().(*govmomi.Client)
// finder := find.NewFinder(client.Client, true) // finder := find.NewFinder(client.Client, true)
folder, _ := object.NewSearchIndex(client.Client).FindByInventoryPath( folder, _ := object.NewSearchIndex(client.Client).FindByInventoryPath(
context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name)) context.TODO(), fmt.Sprintf("%v/vm/%v", datacenter, folder_name))
if folder != nil { if folder != nil {
deleteFolder(client, &f) deleteFolder(client, &f)
} }
@ -276,4 +273,4 @@ resource "vsphere_folder" "%s" {
path = "%s" path = "%s"
datacenter = "%s" datacenter = "%s"
} }
` `

4
builtin/providers/vsphere/resource_vsphere_virtual_machine.go
View File

@ -426,7 +426,7 @@ func resourceVSphereVirtualMachineCreate(d *schema.ResourceData, meta interface{
} }
func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{}) error { func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] reading virtual machine: %#v", d) log.Printf("[DEBUG] reading virtual machine: %#v", d)
client := meta.(*govmomi.Client) client := meta.(*govmomi.Client)
dc, err := getDatacenter(client, d.Get("datacenter").(string)) dc, err := getDatacenter(client, d.Get("datacenter").(string))
@ -1021,7 +1021,7 @@ func (vm *virtualMachine) deployVirtualMachine(c *govmomi.Client) error {
if err != nil { if err != nil {
return err return err
} }
log.Printf("[DEBUG] folder: %#v", vm.folder) log.Printf("[DEBUG] folder: %#v", vm.folder)
folder := dcFolders.VmFolder folder := dcFolders.VmFolder
if len(vm.folder) > 0 { if len(vm.folder) > 0 {

14
builtin/providers/vsphere/resource_vsphere_virtual_machine_test.go
View File

@ -216,8 +216,8 @@ func TestAccVSphereVirtualMachine_createInExistingFolder(t *testing.T) {
label := os.Getenv("VSPHERE_NETWORK_LABEL_DHCP") label := os.Getenv("VSPHERE_NETWORK_LABEL_DHCP")
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: resource.ComposeTestCheckFunc( CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckVSphereVirtualMachineDestroy, testAccCheckVSphereVirtualMachineDestroy,
removeVSphereFolder(datacenter, folder, ""), removeVSphereFolder(datacenter, folder, ""),
@ -283,8 +283,8 @@ func TestAccVSphereVirtualMachine_createWithFolder(t *testing.T) {
label := os.Getenv("VSPHERE_NETWORK_LABEL_DHCP") label := os.Getenv("VSPHERE_NETWORK_LABEL_DHCP")
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: resource.ComposeTestCheckFunc( CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckVSphereVirtualMachineDestroy, testAccCheckVSphereVirtualMachineDestroy,
testAccCheckVSphereFolderDestroy, testAccCheckVSphereFolderDestroy,
@ -344,7 +344,6 @@ func testAccCheckVSphereVirtualMachineDestroy(s *terraform.State) error {
return fmt.Errorf("error %s", err) return fmt.Errorf("error %s", err)
} }
folder := dcFolders.VmFolder folder := dcFolders.VmFolder
if len(rs.Primary.Attributes["folder"]) > 0 { if len(rs.Primary.Attributes["folder"]) > 0 {
si := object.NewSearchIndex(client.Client) si := object.NewSearchIndex(client.Client)
@ -370,7 +369,6 @@ func testAccCheckVSphereVirtualMachineDestroy(s *terraform.State) error {
func testAccCheckVSphereVirtualMachineExistsHasCustomConfig(n string, vm *virtualMachine) resource.TestCheckFunc { func testAccCheckVSphereVirtualMachineExistsHasCustomConfig(n string, vm *virtualMachine) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
return fmt.Errorf("Not found: %s", n) return fmt.Errorf("Not found: %s", n)
@ -393,7 +391,6 @@ func testAccCheckVSphereVirtualMachineExistsHasCustomConfig(n string, vm *virtua
return fmt.Errorf("error %s", err) return fmt.Errorf("error %s", err)
} }
_, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["name"]) _, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), dcFolders.VmFolder, rs.Primary.Attributes["name"])
if err != nil { if err != nil {
return fmt.Errorf("error %s", err) return fmt.Errorf("error %s", err)
@ -493,7 +490,6 @@ func testAccCheckVSphereVirtualMachineExists(n string, vm *virtualMachine) resou
_, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), folder, rs.Primary.Attributes["name"]) _, err = object.NewSearchIndex(client.Client).FindChild(context.TODO(), folder, rs.Primary.Attributes["name"])
*vm = virtualMachine{ *vm = virtualMachine{
name: rs.Primary.ID, name: rs.Primary.ID,
} }
@ -598,4 +594,4 @@ resource "vsphere_virtual_machine" "with_folder" {
template = "%s" template = "%s"
} }
} }
` `