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 bitbucket server to latest LTS (7.21.3) #50

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade bitbucket server to latest LTS (7.21.3) #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build: fmtcheck
go install

test: fmtcheck
go test -i $(TEST) || exit 1
go test $(TEST) || exit 1
echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4

Expand Down
6 changes: 3 additions & 3 deletions bitbucket/data_application_properties_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ func TestAccBitbucketDataApplicationProperties(t *testing.T) {
{
Config: config,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "version", "6.10.0"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_number", "6010000"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_date", "1578626301641"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "version", "7.21.3"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_number", "7021003"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_date", "1657863138209"),
resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "display_name", "Bitbucket"),
),
},
Expand Down
4 changes: 2 additions & 2 deletions bitbucket/data_project_hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAccBitbucketDataProjectHooks_simple(t *testing.T) {
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.name", "All reviewers approve"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.type", "PRE_PULL_REQUEST_MERGE"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.description", "Require all reviewers to approve the pull request."),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.version", "6.10.0"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.version", "7.21.3"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.#", "2"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.0", "PROJECT"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.1", "REPOSITORY"),
Expand Down Expand Up @@ -74,7 +74,7 @@ func TestAccBitbucketDataProjectHooks_type(t *testing.T) {
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.name", "Reject Force Push"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.type", "PRE_RECEIVE"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.description", "Reject all force pushes (git push --force) to this repository"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.version", "6.10.0"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.version", "7.21.3"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.#", "2"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.0", "PROJECT"),
resource.TestCheckResourceAttr("data.bitbucketserver_project_hooks.test", "hooks.0.scope_types.1", "REPOSITORY"),
Expand Down
4 changes: 2 additions & 2 deletions bitbucket/data_repository_hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestAccBitbucketDataRepositoryHooks_simple(t *testing.T) {
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.name", "All reviewers approve"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.type", "PRE_PULL_REQUEST_MERGE"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.description", "Require all reviewers to approve the pull request."),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.version", "6.10.0"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.version", "7.21.3"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.#", "2"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.0", "PROJECT"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.1", "REPOSITORY"),
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestAccBitbucketDataRepositoryHooks_type(t *testing.T) {
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.name", "Reject Force Push"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.type", "PRE_RECEIVE"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.description", "Reject all force pushes (git push --force) to this repository"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.version", "6.10.0"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.version", "7.21.3"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.#", "2"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.0", "PROJECT"),
resource.TestCheckResourceAttr("data.bitbucketserver_repository_hooks.test", "hooks.0.scope_types.1", "REPOSITORY"),
Expand Down
2 changes: 1 addition & 1 deletion bitbucket/data_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccBitbucketDataUser(t *testing.T) {
resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "name", "admin"),
resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "email_address", "[email protected]"),
resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "display_name", "Admin"),
resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "user_id", "1"),
resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "user_id", "2"),
),
},
},
Expand Down
8 changes: 4 additions & 4 deletions docs/data-sources/bitbucketserver_project_hooks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data "bitbucketserver_project_hooks" "main" {
# "name" = "Reject Force Push",
# "type" = "PRE_RECEIVE",
# "description" = "Reject all force pushes (git push --force) to this repository",
# "version" = "6.10.0",
# "version" = "7.21.3",
# "scope_types" = ["PROJECT", "REPOSITORY"],
# "enabled" = "false",
# "configured" = "false",
Expand All @@ -25,7 +25,7 @@ data "bitbucketserver_project_hooks" "main" {
### Applying a Custom Filter

Find specific types of project hooks.

```hcl
data "bitbucketserver_project_hooks" "main" {
project = "TEST"
Expand All @@ -46,9 +46,9 @@ data "bitbucketserver_project_hooks" "main" {
* `name` - Name of the hook e.g. `Reject Force Push`
* `type` - Type of the hook e.g. `PRE_RECEIVE`
* `description` - Detailed description e.g. `Reject all force pushes (git push --force) to this repository`
* `version` - Version of the hook, for system hooks this is the bitbucket version e.g. `6.10.0`
* `version` - Version of the hook, for system hooks this is the bitbucket version e.g. `7.21.3`
* `scope_types` - List of strings containing the scopes available for this hook, e.g. `["PROJECT", "REPOSITORY"]`
* `enabled` - Set if this hook is enabled for this project
* `configured` - Set if the hook is configured for this project
* `configured` - Set if the hook is configured for this project
* `scope_type` - Type of scope applied for this hook, e.g. `PROJECT`
* `scope_resource_id` - Reference ID of the applied scope, e.g. `1`
8 changes: 4 additions & 4 deletions docs/data-sources/bitbucketserver_repository_hooks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data "bitbucketserver_repository_hooks" "main" {
# "name" = "Reject Force Push",
# "type" = "PRE_RECEIVE",
# "description" = "Reject all force pushes (git push --force) to this repository",
# "version" = "6.10.0",
# "version" = "7.21.3",
# "scope_types" = ["PROJECT", "REPOSITORY"],
# "enabled" = "false",
# "configured" = "false",
Expand All @@ -26,7 +26,7 @@ data "bitbucketserver_repository_hooks" "main" {
### Applying a Custom Filter

Find specific types of repository hooks.

```hcl
data "bitbucketserver_project_hooks" "main" {
project = "TEST"
Expand All @@ -49,9 +49,9 @@ data "bitbucketserver_project_hooks" "main" {
* `name` - Name of the hook e.g. `Reject Force Push`
* `type` - Type of the hook e.g. `PRE_RECEIVE`
* `description` - Detailed description e.g. `Reject all force pushes (git push --force) to this repository`
* `version` - Version of the hook, for system hooks this is the bitbucket version e.g. `6.10.0`
* `version` - Version of the hook, for system hooks this is the bitbucket version e.g. `7.21.3`
* `scope_types` - List of strings containing the scopes available for this hook, e.g. `["PROJECT", "REPOSITORY"]`
* `enabled` - Set if this hook is enabled for this project
* `configured` - Set if the hook is configured for this project
* `configured` - Set if the hook is configured for this project
* `scope_type` - Type of scope applied for this hook, e.g. `REPOSITORY`
* `scope_resource_id` - Reference ID of the applied scope, e.g. `1`
2 changes: 1 addition & 1 deletion scripts/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
bitbucket:
image: atlassian/bitbucket-server:6.10.0
image: atlassian/bitbucket-server:7.21.3
restart: always
networks:
- bridge
Expand Down