Skip to content

Commit

Permalink
Merge pull request integrations#178 from terraform-providers/go1.11-u…
Browse files Browse the repository at this point in the history
…pgrade-2019-01-07

[AUTOMATED] Upgrade to Go 1.11
  • Loading branch information
appilon authored Jan 10, 2019
2 parents 4238b0f + 57932e1 commit 1f1bcb4
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
language: go
go:
- "1.10.x"
- "1.11.x"

install:
# This script is used by the Travis build to install a cookie for
Expand Down
8 changes: 4 additions & 4 deletions github/data_source_github_ip_ranges.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ func dataSourceGithubIpRanges() *schema.Resource {
Read: dataSourceGithubIpRangesRead,

Schema: map[string]*schema.Schema{
"hooks": &schema.Schema{
"hooks": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"git": &schema.Schema{
"git": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"pages": &schema.Schema{
"pages": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"importer": &schema.Schema{
"importer": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Expand Down
12 changes: 6 additions & 6 deletions github/data_source_github_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ func dataSourceGithubTeam() *schema.Resource {
Read: dataSourceGithubTeamRead,

Schema: map[string]*schema.Schema{
"slug": &schema.Schema{
"slug": {
Type: schema.TypeString,
Required: true,
},
"name": &schema.Schema{
"name": {
Type: schema.TypeString,
Computed: true,
},
"description": &schema.Schema{
"description": {
Type: schema.TypeString,
Computed: true,
},
"privacy": &schema.Schema{
"privacy": {
Type: schema.TypeString,
Computed: true,
},
"permission": &schema.Schema{
"permission": {
Type: schema.TypeString,
Computed: true,
},
"members": &schema.Schema{
"members": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
Expand Down
38 changes: 19 additions & 19 deletions github/data_source_github_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,81 +13,81 @@ func dataSourceGithubUser() *schema.Resource {
Read: dataSourceGithubUserRead,

Schema: map[string]*schema.Schema{
"username": &schema.Schema{
"username": {
Type: schema.TypeString,
Required: true,
},
"login": &schema.Schema{
"login": {
Type: schema.TypeString,
Computed: true,
},
"avatar_url": &schema.Schema{
"avatar_url": {
Type: schema.TypeString,
Computed: true,
},
"gravatar_id": &schema.Schema{
"gravatar_id": {
Type: schema.TypeString,
Computed: true,
},
"site_admin": &schema.Schema{
"site_admin": {
Type: schema.TypeBool,
Computed: true,
},
"name": &schema.Schema{
"name": {
Type: schema.TypeString,
Computed: true,
},
"company": &schema.Schema{
"company": {
Type: schema.TypeString,
Computed: true,
},
"blog": &schema.Schema{
"blog": {
Type: schema.TypeString,
Computed: true,
},
"location": &schema.Schema{
"location": {
Type: schema.TypeString,
Computed: true,
},
"email": &schema.Schema{
"email": {
Type: schema.TypeString,
Computed: true,
},
"bio": &schema.Schema{
"bio": {
Type: schema.TypeString,
Computed: true,
},
"gpg_keys": &schema.Schema{
"gpg_keys": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"ssh_keys": &schema.Schema{
"ssh_keys": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"public_repos": &schema.Schema{
"public_repos": {
Type: schema.TypeInt,
Computed: true,
},
"public_gists": &schema.Schema{
"public_gists": {
Type: schema.TypeInt,
Computed: true,
},
"followers": &schema.Schema{
"followers": {
Type: schema.TypeInt,
Computed: true,
},
"following": &schema.Schema{
"following": {
Type: schema.TypeInt,
Computed: true,
},
"created_at": &schema.Schema{
"created_at": {
Type: schema.TypeString,
Computed: true,
},
"updated_at": &schema.Schema{
"updated_at": {
Type: schema.TypeString,
Computed: true,
},
Expand Down
8 changes: 4 additions & 4 deletions github/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ func Provider() terraform.ResourceProvider {
var p *schema.Provider
p = &schema.Provider{
Schema: map[string]*schema.Schema{
"token": &schema.Schema{
"token": {
Type: schema.TypeString,
Required: true,
DefaultFunc: schema.EnvDefaultFunc("GITHUB_TOKEN", nil),
Description: descriptions["token"],
},
"organization": &schema.Schema{
"organization": {
Type: schema.TypeString,
Required: true,
DefaultFunc: schema.EnvDefaultFunc("GITHUB_ORGANIZATION", nil),
Description: descriptions["organization"],
},
"base_url": &schema.Schema{
"base_url": {
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("GITHUB_BASE_URL", ""),
Description: descriptions["base_url"],
},
"insecure": &schema.Schema{
"insecure": {
Type: schema.TypeBool,
Optional: true,
Default: false,
Expand Down
2 changes: 1 addition & 1 deletion github/resource_github_organization_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func resourceGithubOrganizationWebhook() *schema.Resource {
ForceNew: true,
ValidateFunc: validateGithubOrganizationWebhookName,
},
"events": &schema.Schema{
"events": {
Type: schema.TypeSet,
Required: true,
Elem: &schema.Schema{Type: schema.TypeString},
Expand Down
8 changes: 4 additions & 4 deletions github/resource_github_repository_deploy_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ func resourceGithubRepositoryDeployKey() *schema.Resource {

// Deploy keys are defined immutable in the API. Updating results in force new.
Schema: map[string]*schema.Schema{
"key": &schema.Schema{
"key": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
DiffSuppressFunc: suppressDeployKeyDiff,
},
"read_only": &schema.Schema{
"read_only": {
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
Default: true,
},
"repository": &schema.Schema{
"repository": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"title": &schema.Schema{
"title": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Expand Down

0 comments on commit 1f1bcb4

Please sign in to comment.