Merge branch 'main' into update-repo-security-analysis-separately

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
  env:
  GITHUB_TEST_ORGANIZATION: 'kfcampbell-terraform-provider'
  steps:
- - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
  go-version-file: 'go.mod'

.github/workflows/codeql.yml

@@ -25,7 +25,7 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
  - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
@@ -34,14 +34,14 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+ uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
  with:
  languages: ${{ matrix.language }}
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+ uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+ uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
  with:
  category: "/language:${{matrix.language}}"

.github/workflows/dotcom-acceptance-tests-all.yml

@@ -16,7 +16,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -34,7 +34,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -67,7 +67,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2

.github/workflows/dotcom-acceptance-tests-manual.yml

@@ -17,7 +17,7 @@ jobs:
  jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
  )"
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -49,7 +49,7 @@ jobs:
  jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
  )"
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -86,7 +86,7 @@ jobs:
  jq -rc .label.name $GITHUB_EVENT_PATH | cut -d/ -f 2
  )"
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2

.github/workflows/dotcom-acceptance-tests.yml

@@ -11,7 +11,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -24,7 +24,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -44,7 +44,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2

.github/workflows/ghes-acceptance-tests-all.yml

@@ -28,7 +28,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -47,7 +47,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -82,7 +82,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2

.github/workflows/ghes-acceptance-tests.yml

@@ -23,7 +23,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -42,7 +42,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2
@@ -63,7 +63,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  ref: ${{ github.event.pull_request.head.ref }}
  fetch-depth: 2

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
  goreleaser:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+ - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
  with:
  # Allow goreleaser to access older tag information.
  fetch-depth: 0

github/config.go

@@ -8,7 +8,7 @@ import (
  "strings"
  "time"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
  "github.com/shurcooL/githubv4"
  "golang.org/x/oauth2"

github/data_source_github_actions_environment_secrets.go

@@ -5,7 +5,7 @@ import (
  "fmt"
  "net/url"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_actions_environment_variables.go

@@ -5,7 +5,7 @@ import (
  "fmt"
  "net/url"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_actions_organization_secrets.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_actions_organization_variables.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_actions_secrets.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_actions_variables.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_app_token_test.go

@@ -7,7 +7,7 @@ import (
  "os"
  "testing"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
  "github.com/stretchr/testify/assert"
 )

github/data_source_github_branch.go

@@ -5,7 +5,7 @@ import (
  "log"
  "net/http"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

github/data_source_github_codespaces_organization_secrets.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_codespaces_secrets.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_codespaces_user_secrets.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_collaborators.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )

github/data_source_github_dependabot_organization_secrets.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_dependabot_secrets.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_external_groups.go

@@ -5,7 +5,7 @@ import (
  "encoding/json"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

github/data_source_github_issue_labels.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

github/data_source_github_organization.go

@@ -3,7 +3,7 @@ package github
 import (
  "strconv"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
  "github.com/shurcooL/githubv4"
 )

github/data_source_github_organization_custom_role.go

@@ -5,7 +5,7 @@ import (
  "fmt"
  "log"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

github/data_source_github_organization_team_sync_groups.go

@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -42,7 +42,11 @@ func dataSourceGithubOrganizationTeamSyncGroupsRead(d *schema.ResourceData, meta
  ctx := context.Background()
 
  orgName := meta.(*Owner).name
- options := &github.ListCursorOptions{PerPage: maxPerPage}
+ options := &github.ListIDPGroupsOptions{
+ ListCursorOptions: github.ListCursorOptions{
+ PerPage: maxPerPage,
+ },
+ }
 
  groups := make([]interface{}, 0)
  for {

github/data_source_github_organization_webhooks.go

@@ -3,7 +3,7 @@ package github
 import (
  "context"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

github/data_source_github_ref.go

@@ -5,7 +5,7 @@ import (
  "log"
  "net/http"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

github/data_source_github_release.go

@@ -8,7 +8,7 @@ import (
 
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
- "github.com/google/go-github/v63/github"
+ "github.com/google/go-github/v65/github"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )