Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to SDK v2 #37

Merged
merged 7 commits into from
Jul 31, 2020
Merged

Upgrade to SDK v2 #37

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
395c85e
remove vendor dir
Jul 31, 2020
aebcf23
upgrade to sdkv2
Jul 31, 2020
b8ca798
bugfix: Add `container` field in group datasource schema
Jul 31, 2020
9759ac2
Deprecate ImportStatePassthrough
Jul 31, 2020
60d1db3
Revert "remove vendor dir"
Jul 31, 2020
5f7b691
go mod tidy
Jul 31, 2020
1c574e0
put back `-mod=vendor` in GOFLAGS and update vendor dir
Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ WEBSITE_REPO=github.com/hashicorp/terraform-website
PKG_NAME=scaffolding
COVER_TEST?=$$(go list ./... |grep -v 'vendor')

.EXPORT_ALL_VARIABLES:
GOFLAGS=-mod=vendor

default: build

build: fmtcheck
Expand Down
2 changes: 1 addition & 1 deletion ad/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/masterzen/winrm"
"github.com/packer-community/winrmcp/winrmcp"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_computer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ad
import (
"fmt"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/winrmhelper"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_computer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDataSourceADComputer_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_gpo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ad
import (
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/winrmhelper"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_gpo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceADGPO_basic(t *testing.T) {
Expand Down
7 changes: 6 additions & 1 deletion ad/data_source_ad_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/hashicorp/terraform-provider-ad/ad/internal/winrmhelper"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceADGroup() *schema.Resource {
Expand Down Expand Up @@ -43,6 +43,11 @@ func dataSourceADGroup() *schema.Resource {
Computed: true,
Description: "The Group's scope.",
},
"container": {
Type: schema.TypeString,
Computed: true,
Description: "The Group's container object.",
},
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDatasourceADGroup_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_ou.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/winrmhelper"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_ou_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDataSourceADOU_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/hashicorp/terraform-provider-ad/ad/internal/winrmhelper"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func dataSourceADUser() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion ad/data_source_ad_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccDataSourceADUser_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/adschema/resource_ad_gpo_security_schema_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package adschema

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

// GPOSecuritySchemaKeys is a list of all keys defined in the resource's schema
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/account_lockout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gposec

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/account_lockout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/application_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gposec

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

// ApplicationLog represents the Application Log section of the Security Settings GPO extension
type ApplicationLog struct {
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/application_log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/audit_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gposec

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

// AuditLog represents the Audit Log section of the Security Settings GPO extension
type AuditLog struct {
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/audit_log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/event_audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gposec

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/event_audit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/event_log_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gposec

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/file_system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"gopkg.in/ini.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/file_system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
"gopkg.in/ini.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/inihelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"log"
"reflect"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
"golang.org/x/text/encoding/unicode"
"gopkg.in/ini.v1"
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/kerberos_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gposec

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/kerberos_settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/password_policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gposec

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/password_policies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/registry_keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"gopkg.in/ini.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/registry_keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
"gopkg.in/ini.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/registry_values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"gopkg.in/ini.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/registry_values_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
"gopkg.in/ini.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/restricted_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"gopkg.in/ini.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/restricted_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
"gopkg.in/ini.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/system_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gposec

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

// SystemLog represents the system log section of the Security Settings GPO extension
type SystemLog struct {
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/system_log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gposec
import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/system_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"gopkg.in/ini.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/gposec/system_services_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-ad/ad/internal/adschema"
"gopkg.in/ini.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/winrmhelper/winrm_computer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/masterzen/winrm"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/winrmhelper/winrm_gplink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/masterzen/winrm"
)

Expand Down
2 changes: 1 addition & 1 deletion ad/internal/winrmhelper/winrm_gpo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/masterzen/winrm"
"github.com/packer-community/winrmcp/winrmcp"
"gopkg.in/ini.v1"
Expand Down
2 changes: 1 addition & 1 deletion ad/internal/winrmhelper/winrm_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/masterzen/winrm"
)

Expand Down
Loading