github-mirrors/terraform-provider-bitbucketserver
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git synced 2026-04-20 15:51:20 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Rename admin_* resources to plain names

Browse Source
This commit is contained in:
Gavin Bunney
2019-10-10 11:46:28 -07:00
parent 66696e3785
commit e01c73392b
7 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -174,7 +174,7 @@ $ terraform import bitbucketserver_user.test mreynolds
### Set Server License ### Set Server License
```hcl ```hcl
resource "bitbucketserver_admin_license" "main" { resource "bitbucketserver_license" "main" {
license = "AAACLg0ODAoPeNqNVEtv4jAQvudXRNpbp" license = "AAACLg0ODAoPeNqNVEtv4jAQvudXRNpbp"
} }
``` ```
@@ -200,14 +200,14 @@ Additional to the above, the following attributes are emitted:
#### Import License #### Import License
```bash ```bash
$ terraform import bitbucketserver_admin_license.main license $ terraform import bitbucketserver_license.main license
``` ```
### Set Mail Server Configuration ### Set Mail Server Configuration
```hcl ```hcl
resource "bitbucketserver_admin_mail_server" "mail" { resource "bitbucketserver_mail_server" "mail" {
hostname = "mail.example.com" hostname = "mail.example.com"
port = 465 port = 465
protocol = "SMTPS" protocol = "SMTPS"
@@ -227,7 +227,7 @@ resource "bitbucketserver_admin_mail_server" "mail" {
#### Import Mail Configuration #### Import Mail Configuration
```bash ```bash
$ terraform import bitbucketserver_admin_mail_server.mail mail.example.com $ terraform import bitbucketserver_mail_server.mail mail.example.com
``` ```
--- ---

2
bitbucket/client.go
View File

@@ -69,7 +69,7 @@ func (c *BitbucketClient) Do(method, endpoint string, payload *bytes.Buffer) (*h
resp, err := c.HTTPClient.Do(req) resp, err := c.HTTPClient.Do(req)
log.Printf("[DEBUG] Resp: %v Err: %v", resp, err) log.Printf("[DEBUG] Resp: %v Err: %v", resp, err)
if resp.StatusCode >= 400 || resp.StatusCode < 200 { if resp != nil && (resp.StatusCode >= 400 || resp.StatusCode < 200) {
apiError := Error{ apiError := Error{
StatusCode: resp.StatusCode, StatusCode: resp.StatusCode,
Endpoint: endpoint, Endpoint: endpoint,

4
bitbucket/provider.go
View File

@@ -34,8 +34,8 @@ func Provider() terraform.ResourceProvider {
"bitbucketserver_project_permissions_users": dataSourceProjectPermissionsUsers(), "bitbucketserver_project_permissions_users": dataSourceProjectPermissionsUsers(),
}, },
ResourcesMap: map[string]*schema.Resource{ ResourcesMap: map[string]*schema.Resource{
"bitbucketserver_admin_license": resourceAdminLicense(), "bitbucketserver_license": resourceLicense(),
"bitbucketserver_admin_mail_server": resourceAdminMailServer(), "bitbucketserver_mail_server": resourceMailServer(),
"bitbucketserver_project": resourceProject(), "bitbucketserver_project": resourceProject(),
"bitbucketserver_project_permissions_group": resourceProjectPermissionsGroup(), "bitbucketserver_project_permissions_group": resourceProjectPermissionsGroup(),
"bitbucketserver_project_permissions_user": resourceProjectPermissionsUser(), "bitbucketserver_project_permissions_user": resourceProjectPermissionsUser(),

22
bitbucket/resource_admin_license.go → bitbucket/resource_license.go
View File

@@ -26,12 +26,12 @@ type LicenseResponse struct {
SupportEntitlementNumber string `json:"supportEntitlementNumber,omitempty"` SupportEntitlementNumber string `json:"supportEntitlementNumber,omitempty"`
} }
func resourceAdminLicense() *schema.Resource { func resourceLicense() *schema.Resource {
return &schema.Resource{ return &schema.Resource{
Create: resourceAdminLicenseCreate, Create: resourceLicenseCreate,
Update: resourceAdminLicenseUpdate, Update: resourceLicenseUpdate,
Read: resourceAdminLicenseRead, Read: resourceLicenseRead,
Delete: resourceAdminLicenseDelete, Delete: resourceLicenseDelete,
Importer: &schema.ResourceImporter{ Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough, State: schema.ImportStatePassthrough,
}, },
@@ -90,7 +90,7 @@ func newLicenseFromResource(d *schema.ResourceData) *License {
return license return license
} }
func resourceAdminLicenseUpdate(d *schema.ResourceData, m interface{}) error { func resourceLicenseUpdate(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
license := newLicenseFromResource(d) license := newLicenseFromResource(d)
@@ -106,14 +106,14 @@ func resourceAdminLicenseUpdate(d *schema.ResourceData, m interface{}) error {
} }
d.SetId(fmt.Sprintf("%x", sha256.Sum256([]byte(license.License)))) d.SetId(fmt.Sprintf("%x", sha256.Sum256([]byte(license.License))))
return resourceAdminLicenseRead(d, m) return resourceLicenseRead(d, m)
} }
func resourceAdminLicenseCreate(d *schema.ResourceData, m interface{}) error { func resourceLicenseCreate(d *schema.ResourceData, m interface{}) error {
return resourceAdminLicenseUpdate(d, m) return resourceLicenseUpdate(d, m)
} }
func resourceAdminLicenseRead(d *schema.ResourceData, m interface{}) error { func resourceLicenseRead(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
req, err := client.Get("/rest/api/1.0/admin/license") req, err := client.Get("/rest/api/1.0/admin/license")
@@ -151,7 +151,7 @@ func resourceAdminLicenseRead(d *schema.ResourceData, m interface{}) error {
return nil return nil
} }
func resourceAdminLicenseDelete(d *schema.ResourceData, m interface{}) error { func resourceLicenseDelete(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
_, err := client.Delete("/rest/api/1.0/admin/mail-server") _, err := client.Delete("/rest/api/1.0/admin/mail-server")
return err return err

20
bitbucket/resource_admin_license_test.go → bitbucket/resource_license_test.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccBitbucketAdminLicense(t *testing.T) { func TestAccBitbucketLicense(t *testing.T) {
testAccBitbucketAdminLicenseConfig := ` testAccBitbucketLicenseConfig := `
resource "bitbucketserver_admin_license" "test" { 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 = "AAACLg0ODAoPeNqNVEtv4jAQvudXRNpbpUSEx6FIOQBxW3ZZiCB0V1WllXEG8DbYke3A8u/XdUgVQyg9ZvLN+HuM/e1BUHdGlNvuuEHQ73X73Y4bR4nbbgU9ZwFiD2IchcPH+8T7vXzuej9eXp68YSv45UwoASYhOeYwxTsIE7RIxtNHhwh+SP3a33D0XnntuxHsIeM5CIdwtvYxUXQPoRIF6KaC0FUGVlEB3v0hOAOWYiH9abFbgZith3i34nwOO65gsAGmZBhUbNC/nIpjhBWEcefJWelzqIDPWz/OtjmXRYv2XyqwnwueFkT57x8e4cLmbCD1QnX0UoKQoRc4EUgiaK4oZ2ECUrlZeay75sLNs2JDmZtWR8oPCfWZGwHAtjzXgIo0SqmZiKYJmsfz8QI5aI+zApuq6fqJKVPAMCPnNpk4LPW6kBWgkZb+kQAzzzS2g6Dnte69Tqvsr4SOskIqEFOeggz1v4zrHbr0yLJR8rU64FpQpVtBy1mZxM4CnHC9Faf8tKMnTF1AiXORFixyQaWto3RZ+ncWLXtMg6EnKZZRpmQNb2R8tnJXFulCfXmXLry7TrHBWn2HNVyH8WYxj9AzmsxiNL/R88Xg6rA1lVs4QpO5titxhplJcCY2mFFZLutAZVhKipm15/VhJx36YVqyN8YP7IaGC1+lwnJ7Q5pJpNmxk5hP3qovutY8Pi4E2WIJ59esnr1p+T6eD67teBVCHf+ga+ho4/4D9YItZDAsAhQ5qQ6pASJ+SA7YG9zthbLxRoBBEwIURQr5Zy1B8PonepyLz3UhL7kMVEs=X02q6"
} }
` `
@@ -18,28 +18,28 @@ func TestAccBitbucketAdminLicense(t *testing.T) {
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: testAccCheckBitbucketAdminLicenseDestroy, CheckDestroy: testAccCheckBitbucketLicenseDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccBitbucketAdminLicenseConfig, Config: testAccBitbucketLicenseConfig,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckBitbucketAdminLicenseExists("bitbucketserver_admin_license.test"), testAccCheckBitbucketLicenseExists("bitbucketserver_license.test"),
), ),
}, },
}, },
}) })
} }
func testAccCheckBitbucketAdminLicenseDestroy(s *terraform.State) error { func testAccCheckBitbucketLicenseDestroy(s *terraform.State) error {
_, ok := s.RootModule().Resources["bitbucketserver_admin_license.test"] _, ok := s.RootModule().Resources["bitbucketserver_license.test"]
if !ok { if !ok {
return fmt.Errorf("not found %s", "bitbucketserver_admin_license.test") return fmt.Errorf("not found %s", "bitbucketserver_license.test")
} }
return nil return nil
} }
func testAccCheckBitbucketAdminLicenseExists(n string) resource.TestCheckFunc { func testAccCheckBitbucketLicenseExists(n string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {

22
bitbucket/resource_admin_mail_server.go → bitbucket/resource_mail_server.go
View File

@@ -18,12 +18,12 @@ type MailConfiguration struct {
SenderAddress string `json:"sender-address,omitempty"` SenderAddress string `json:"sender-address,omitempty"`
} }
func resourceAdminMailServer() *schema.Resource { func resourceMailServer() *schema.Resource {
return &schema.Resource{ return &schema.Resource{
Create: resourceAdminMailServerCreate, Create: resourceMailServerCreate,
Update: resourceAdminMailServerUpdate, Update: resourceMailServerUpdate,
Read: resourceAdminMailServerRead, Read: resourceMailServerRead,
Delete: resourceAdminMailServerDelete, Delete: resourceMailServerDelete,
Importer: &schema.ResourceImporter{ Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough, State: schema.ImportStatePassthrough,
}, },
@@ -85,7 +85,7 @@ func newMailConfigurationFromResource(d *schema.ResourceData) *MailConfiguration
return mailConfiguration return mailConfiguration
} }
func resourceAdminMailServerUpdate(d *schema.ResourceData, m interface{}) error { func resourceMailServerUpdate(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
mailConfiguration := newMailConfigurationFromResource(d) mailConfiguration := newMailConfigurationFromResource(d)
@@ -102,14 +102,14 @@ func resourceAdminMailServerUpdate(d *schema.ResourceData, m interface{}) error
d.SetId(mailConfiguration.Hostname) d.SetId(mailConfiguration.Hostname)
return resourceAdminMailServerRead(d, m) return resourceMailServerRead(d, m)
} }
func resourceAdminMailServerCreate(d *schema.ResourceData, m interface{}) error { func resourceMailServerCreate(d *schema.ResourceData, m interface{}) error {
return resourceAdminMailServerUpdate(d, m) return resourceMailServerUpdate(d, m)
} }
func resourceAdminMailServerRead(d *schema.ResourceData, m interface{}) error { func resourceMailServerRead(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
req, err := client.Get("/rest/api/1.0/admin/mail-server") req, err := client.Get("/rest/api/1.0/admin/mail-server")
@@ -145,7 +145,7 @@ func resourceAdminMailServerRead(d *schema.ResourceData, m interface{}) error {
return nil return nil
} }
func resourceAdminMailServerDelete(d *schema.ResourceData, m interface{}) error { func resourceMailServerDelete(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient) client := m.(*BitbucketClient)
_, err := client.Delete("/rest/api/1.0/admin/mail-server") _, err := client.Delete("/rest/api/1.0/admin/mail-server")
return err return err

20
bitbucket/resource_admin_mail_server_test.go → bitbucket/resource_mail_server_test.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccBitbucketAdminMailServer(t *testing.T) { func TestAccBitbucketMailServer(t *testing.T) {
testAccBitbucketAdminMailServerConfig := ` testAccBitbucketMailServerConfig := `
resource "bitbucketserver_admin_mail_server" "test" { resource "bitbucketserver_mail_server" "test" {
hostname = "mail.example.com" hostname = "mail.example.com"
port = 465 port = 465
protocol = "SMTP" protocol = "SMTP"
@@ -23,23 +23,23 @@ func TestAccBitbucketAdminMailServer(t *testing.T) {
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: testAccCheckBitbucketAdminMailServerDestroy, CheckDestroy: testAccCheckBitbucketMailServerDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccBitbucketAdminMailServerConfig, Config: testAccBitbucketMailServerConfig,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckBitbucketAdminMailServerExists("bitbucketserver_admin_mail_server.test"), testAccCheckBitbucketMailServerExists("bitbucketserver_mail_server.test"),
), ),
}, },
}, },
}) })
} }
func testAccCheckBitbucketAdminMailServerDestroy(s *terraform.State) error { func testAccCheckBitbucketMailServerDestroy(s *terraform.State) error {
client := testAccProvider.Meta().(*BitbucketClient) client := testAccProvider.Meta().(*BitbucketClient)
_, ok := s.RootModule().Resources["bitbucketserver_admin_mail_server.test"] _, ok := s.RootModule().Resources["bitbucketserver_mail_server.test"]
if !ok { if !ok {
return fmt.Errorf("not found %s", "bitbucketserver_admin_mail_server.test") return fmt.Errorf("not found %s", "bitbucketserver_mail_server.test")
} }
response, _ := client.Get("/rest/api/1.0/admin/main-server") response, _ := client.Get("/rest/api/1.0/admin/main-server")
@@ -50,7 +50,7 @@ func testAccCheckBitbucketAdminMailServerDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckBitbucketAdminMailServerExists(n string) resource.TestCheckFunc { func testAccCheckBitbucketMailServerExists(n string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {