diff --git a/bitbucket/data_application_properties_test.go b/bitbucket/data_application_properties_test.go index 64ba0c3..d8a1cd6 100644 --- a/bitbucket/data_application_properties_test.go +++ b/bitbucket/data_application_properties_test.go @@ -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", "8.5.4"), + resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_number", "8005004"), + resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "build_date", "1681201969213"), resource.TestCheckResourceAttr("data.bitbucketserver_application_properties.main", "display_name", "Bitbucket"), ), }, diff --git a/bitbucket/data_project_hooks_test.go b/bitbucket/data_project_hooks_test.go index c2b24f4..7583722 100644 --- a/bitbucket/data_project_hooks_test.go +++ b/bitbucket/data_project_hooks_test.go @@ -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", "8.5.4"), 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"), @@ -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", "8.5.4"), 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"), diff --git a/bitbucket/data_repository_hooks_test.go b/bitbucket/data_repository_hooks_test.go index da8f8b6..ecf94f9 100644 --- a/bitbucket/data_repository_hooks_test.go +++ b/bitbucket/data_repository_hooks_test.go @@ -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", "8.5.4"), 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"), @@ -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", "8.5.4"), 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"), diff --git a/bitbucket/data_user_test.go b/bitbucket/data_user_test.go index 7ffd50f..bf8e4a9 100644 --- a/bitbucket/data_user_test.go +++ b/bitbucket/data_user_test.go @@ -23,7 +23,8 @@ func TestAccBitbucketDataUser(t *testing.T) { resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "name", "admin"), resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "email_address", "admin@example.com"), resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "display_name", "Admin"), - resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "user_id", "1"), + // not sure, why admin has user_id 2 by default, but it seems to be the case since the bitbucket server update + resource.TestCheckResourceAttr("data.bitbucketserver_user.test", "user_id", "2"), ), }, }, diff --git a/bitbucket/resource_license_test.go b/bitbucket/resource_license_test.go index 94a3b01..d44582e 100644 --- a/bitbucket/resource_license_test.go +++ b/bitbucket/resource_license_test.go @@ -9,9 +9,10 @@ import ( ) func TestAccBitbucketLicense(t *testing.T) { + // Licenses can be found at: https://developer.atlassian.com/platform/marketplace/timebomb-licenses-for-testing-server-apps/ testAccBitbucketLicenseConfig := ` resource "bitbucketserver_license" "test" { - license = "AAACLg0ODAoPeNqNVEtv4jAQvudXRNpbpUSEx6FIOQBxW3ZZiCB0V1WllXEG8DbYke3A8u/XdUgVQyg9ZvLN+HuM/e1BUHdGlNvuuEHQ73X73Y4bR4nbbgU9ZwFiD2IchcPH+8T7vXzuej9eXp68YSv45UwoASYhOeYwxTsIE7RIxtNHhwh+SP3a33D0XnntuxHsIeM5CIdwtvYxUXQPoRIF6KaC0FUGVlEB3v0hOAOWYiH9abFbgZith3i34nwOO65gsAGmZBhUbNC/nIpjhBWEcefJWelzqIDPWz/OtjmXRYv2XyqwnwueFkT57x8e4cLmbCD1QnX0UoKQoRc4EUgiaK4oZ2ECUrlZeay75sLNs2JDmZtWR8oPCfWZGwHAtjzXgIo0SqmZiKYJmsfz8QI5aI+zApuq6fqJKVPAMCPnNpk4LPW6kBWgkZb+kQAzzzS2g6Dnte69Tqvsr4SOskIqEFOeggz1v4zrHbr0yLJR8rU64FpQpVtBy1mZxM4CnHC9Faf8tKMnTF1AiXORFixyQaWto3RZ+ncWLXtMg6EnKZZRpmQNb2R8tnJXFulCfXmXLry7TrHBWn2HNVyH8WYxj9AzmsxiNL/R88Xg6rA1lVs4QpO5titxhplJcCY2mFFZLutAZVhKipm15/VhJx36YVqyN8YP7IaGC1+lwnJ7Q5pJpNmxk5hP3qovutY8Pi4E2WIJ59esnr1p+T6eD67teBVCHf+ga+ho4/4D9YItZDAsAhQ5qQ6pASJ+SA7YG9zthbLxRoBBEwIURQr5Zy1B8PonepyLz3UhL7kMVEs=X02q6" + license = "AAABrQ0ODAoPeNp9kVFvmzAQx9/9KSztLZIJZIu0RkJqA6yNViAK0G3d+uDApXgjNrKPbPn2dYG0a6fuwS8+393v//O7vAMa8yN1PerOFrPZYn5GL+OczlzvI0m6/RZ0uisMaON7LgmURF5iwvfgVy3XWpj6nGPDjRFcOqXaE4Pc1M61KEEayI8t9I+DNI6jTbC6uP73wd/FdafLmhsIOYL/yMDcOXM98p95Yyn60wp97PvW769OpFHMRfMWagb6AHoV+svLs5x9LW4+sM+3t1ds6XpfRkw7jwcgEbSPugOSdVtTatGiUHK4mUwmSZqzT+mGrTdpWAT5Kk1YkUW24AcaLFBFt0eKNdARlUayVBVo2mr1E0qk32vE9sdiOr1XzgvEaTN0MBg67hwaKioV0koY1GLbIdjJwlBUtOwMqr39KYfY1JZZclm+9jLEsmbEAZ4CBJvoIo9Ctvz2CP2GrRHe6irkL6l+S5JFiW8Pm7suSfU9l8LwXkwIB2hUaxPmYPAUm/Q2bP315w5MGXL95DmEZ839jFEE3SlNedvS6rTCkOjAm25YvOON3fMAVTj4nTAtAhRH4o+fI5MQ7xSh2mtA1bPJrq0WAgIVAIGperR8m2N0fl/GfUUJfQnd+T1aX02kk" } ` diff --git a/docs/data-sources/bitbucketserver_project_hooks.md b/docs/data-sources/bitbucketserver_project_hooks.md index 5117c69..0638123 100644 --- a/docs/data-sources/bitbucketserver_project_hooks.md +++ b/docs/data-sources/bitbucketserver_project_hooks.md @@ -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" = "8.5.4", # "scope_types" = ["PROJECT", "REPOSITORY"], # "enabled" = "false", # "configured" = "false", @@ -46,7 +46,7 @@ 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. `8.5.4` * `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 diff --git a/docs/data-sources/bitbucketserver_repository_hooks.md b/docs/data-sources/bitbucketserver_repository_hooks.md index f0956ef..b63f02b 100644 --- a/docs/data-sources/bitbucketserver_repository_hooks.md +++ b/docs/data-sources/bitbucketserver_repository_hooks.md @@ -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" = "8.5.4", # "scope_types" = ["PROJECT", "REPOSITORY"], # "enabled" = "false", # "configured" = "false", @@ -49,7 +49,7 @@ 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. `8.5.4` * `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 diff --git a/scripts/docker-compose.yaml b/scripts/docker-compose.yaml index 941ef40..e111c9d 100644 --- a/scripts/docker-compose.yaml +++ b/scripts/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2' services: bitbucket: - image: atlassian/bitbucket-server:6.10.0 + image: atlassian/bitbucket-server:8.5-ubuntu-jdk11 restart: always networks: - bridge @@ -11,11 +11,13 @@ services: environment: - 'SETUP_DISPLAYNAME=Bitbucket' - 'SETUP_BASEURL=http://localhost:7990' - - 'SETUP_LICENSE=AAACLg0ODAoPeNqNVEtv4jAQvudXRNpbpUSEx6FIOQBxW3ZZiCB0V1WllXEG8DbYke3A8u/XdUgVQyg9ZvLN+HuM/e1BUHdGlNvuuEHQ73X73Y4bR4nbbgU9ZwFiD2IchcPH+8T7vXzuej9eXp68YSv45UwoASYhOeYwxTsIE7RIxtNHhwh+SP3a33D0XnntuxHsIeM5CIdwtvYxUXQPoRIF6KaC0FUGVlEB3v0hOAOWYiH9abFbgZith3i34nwOO65gsAGmZBhUbNC/nIpjhBWEcefJWelzqIDPWz/OtjmXRYv2XyqwnwueFkT57x8e4cLmbCD1QnX0UoKQoRc4EUgiaK4oZ2ECUrlZeay75sLNs2JDmZtWR8oPCfWZGwHAtjzXgIo0SqmZiKYJmsfz8QI5aI+zApuq6fqJKVPAMCPnNpk4LPW6kBWgkZb+kQAzzzS2g6Dnte69Tqvsr4SOskIqEFOeggz1v4zrHbr0yLJR8rU64FpQpVtBy1mZxM4CnHC9Faf8tKMnTF1AiXORFixyQaWto3RZ+ncWLXtMg6EnKZZRpmQNb2R8tnJXFulCfXmXLry7TrHBWn2HNVyH8WYxj9AzmsxiNL/R88Xg6rA1lVs4QpO5titxhplJcCY2mFFZLutAZVhKipm15/VhJx36YVqyN8YP7IaGC1+lwnJ7Q5pJpNmxk5hP3qovutY8Pi4E2WIJ59esnr1p+T6eD67teBVCHf+ga+ho4/4D9YItZDAsAhQ5qQ6pASJ+SA7YG9zthbLxRoBBEwIURQr5Zy1B8PonepyLz3UhL7kMVEs=X02q6' +## from https://developer.atlassian.com/platform/marketplace/timebomb-licenses-for-testing-server-apps/ + - 'SETUP_LICENSE=AAABrQ0ODAoPeNp9kVFvmzAQx9/9KSztLZIJZIu0RkJqA6yNViAK0G3d+uDApXgjNrKPbPn2dYG0a6fuwS8+393v//O7vAMa8yN1PerOFrPZYn5GL+OczlzvI0m6/RZ0uisMaON7LgmURF5iwvfgVy3XWpj6nGPDjRFcOqXaE4Pc1M61KEEayI8t9I+DNI6jTbC6uP73wd/FdafLmhsIOYL/yMDcOXM98p95Yyn60wp97PvW769OpFHMRfMWagb6AHoV+svLs5x9LW4+sM+3t1ds6XpfRkw7jwcgEbSPugOSdVtTatGiUHK4mUwmSZqzT+mGrTdpWAT5Kk1YkUW24AcaLFBFt0eKNdARlUayVBVo2mr1E0qk32vE9sdiOr1XzgvEaTN0MBg67hwaKioV0koY1GLbIdjJwlBUtOwMqr39KYfY1JZZclm+9jLEsmbEAZ4CBJvoIo9Ctvz2CP2GrRHe6irkL6l+S5JFiW8Pm7suSfU9l8LwXkwIB2hUaxPmYPAUm/Q2bP315w5MGXL95DmEZ839jFEE3SlNedvS6rTCkOjAm25YvOON3fMAVTj4nTAtAhRH4o+fI5MQ7xSh2mtA1bPJrq0WAgIVAIGperR8m2N0fl/GfUUJfQnd+T1aX02kk' - 'SETUP_SYSADMIN_USERNAME=admin' - 'SETUP_SYSADMIN_PASSWORD=admin' - 'SETUP_SYSADMIN_DISPLAYNAME=Admin' - 'SETUP_SYSADMIN_EMAILADDRESS=admin@example.com' + - 'ELASTICSEARCH_ENABLED=false' mem_limit: 4G networks: