Skip to content

Commit

Permalink
Merge branch 'main' into docs_env_vars_1
Browse files Browse the repository at this point in the history
  • Loading branch information
anryko authored Jun 3, 2024
2 parents 9514349 + dff583d commit ab49a1c
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 68 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: git fetch --prune --unshallow
-
name: Set up Go
uses: actions/setup-go@v5
uses: actions/setup-go@v5.0.1
with:
go-version-file: 'go.mod'
cache: true
Expand All @@ -41,7 +41,7 @@ jobs:
passphrase: ${{ secrets.PASSPHRASE }}
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5.0.0
uses: goreleaser/goreleaser-action@v5.1.0
with:
version: latest
args: release --rm-dist
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
uses: actions/setup-go@v5.0.1
with:
go-version-file: 'go.mod'
cache: true
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
- uses: actions/setup-go@v5.0.1
with:
go-version-file: 'go.mod'
cache: true
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
sleep 30
- name: Set up Go
uses: actions/setup-go@v5
uses: actions/setup-go@v5.0.1
with:
go-version-file: 'go.mod'
cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tfplugindocs-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
go-version-file: tools/go.mod
- name: GOCACHE
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tfplugindocs-generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
go-version-file: tools/go.mod
- name: GOCACHE
Expand Down
1 change: 1 addition & 0 deletions client/replication.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func GetReplicationBody(d *schema.ResourceData) models.ReplicationBody {
Deletion: d.Get("deletion").(bool),
DestNamespace: d.Get("dest_namespace").(string),
DestNamespaceReplace: d.Get("dest_namespace_replace").(int),
CopyByChunk: d.Get("copy_by_chunk").(bool),
Speed: d.Get("speed").(int),
}

Expand Down
1 change: 1 addition & 0 deletions docs/resources/replication.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ resource "harbor_replication" "alpine" {
- `description` (String) Description of the replication policy.
- `dest_namespace` (String) Specify the destination namespace. if empty, the resource will be put under the same namespace as the source.
- `dest_namespace_replace` (Number) Specify the destination namespace flattening policy. Integers from `-1` to `3` are valid values in the harbor API. A value of `-1` will 'Flatten All Levels', `0` means 'No Flattening', `1` 'Flatten 1 Level', `2` 'Flatten 2 Levels', `3` 'Flatten 3 Levels' (Default: `-1`, see [Replication Rules](https://goharbor.io/docs/latest/administration/configuring-replication/create-replication-rules/) for more details)
- `copy_by_chunk` (Boolean) Specify whether to enable the artifact blobs copied by chunks. (Default: `false`)
- `enabled` (Boolean) Specify whether the replication is enabled. (Default: `true`)
- `execute_on_changed` (Boolean) Specify whether to execute the replication rule if new or modified. (Default: `false`)
- `filters` (Block Set) (see [below for nested schema](#nestedblock--filters))
Expand Down
33 changes: 17 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ module github.com/goharbor/terraform-provider-harbor

go 1.22

require github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
require github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0

require (
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
Expand All @@ -21,12 +21,12 @@ require (
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hc-install v0.6.3 // indirect
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
github.com/hashicorp/hc-install v0.6.4 // indirect
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.20.0 // indirect
github.com/hashicorp/terraform-json v0.21.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.22.0 // indirect
github.com/hashicorp/terraform-exec v0.21.0 // indirect
github.com/hashicorp/terraform-json v0.22.1 // indirect
github.com/hashicorp/terraform-plugin-go v0.23.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
Expand All @@ -42,14 +42,15 @@ require (
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.14.2 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/grpc v1.61.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.34.0 // indirect
)
Loading

0 comments on commit ab49a1c

Please sign in to comment.