Merge pull request jfrog#819 from jfrog/jfrogGH-735-add-resource-for-…

…mail-server Add resource for mail server
chb0github · Oct 6, 2023 · c8c984d · c8c984d
2 parents b1cd6a9 + b75bcaf
commit c8c984d
Show file tree

Hide file tree

Showing 20 changed files with 678 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 9.4.0 (Oct 5, 2023). Tested on Artifactory 7.68.13 with Terraform CLI v1.6.0
+
+FEATURES:
+
+* resource/artifactory_mail_server: add a new resource for managing mail server configuration. PR: [#819](https://github.com/jfrog/terraform-provider-artifactory/pull/819) Issue: [#735](https://github.com/jfrog/terraform-provider-artifactory/issues/735)
+
 ## 9.3.1 (Oct 6, 2023). Tested on Artifactory 7.68.13 with Terraform CLI v1.6.0
 
 BUG FIX:
@@ -10,7 +16,6 @@ IMPROVEMENTS:
 * resource/artifactory_distribution_public_key is migrated to Plugin Framework. PR: [#817](https://github.com/jfrog/terraform-provider-artifactory/pull/817)
 * resource/artifactory_remote_\*\_repository: Fix incorrect default value for `store_artifacts_locally` attribute in documentation. PR: [#816](https://github.com/jfrog/terraform-provider-artifactory/pull/816)
 
-
 ## 9.2.1 (Sep 29, 2023). Tested on Artifactory 7.68.11 with Terraform CLI v1.5.7
 
 IMPROVEMENTS:

diff --git a/docs/resources/mail_server.md b/docs/resources/mail_server.md
@@ -0,0 +1,57 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "artifactory_mail_server Resource - terraform-provider-artifactory"
+subcategory: "Configuration"
+---
+
+# Artifactory Mail Server Resource
+
+Provides an Artifactory Mail Server resource. This can be used to create and manage Artifactory mail server configuration.
+
+## Example Usages
+
+```terraform
+resource "artifactory_mail_server" "mymailserver" {
+    enabled         = true
+    artifactory_url = "http://tempurl.org"
+    from            = "[email protected]"
+    host            = "http://tempurl.org"
+    username        = "test-user"
+    password        = "test-password"
+    port            = 25
+    subject_prefix  = "[Test]"
+    use_ssl         = true
+    use_tls         = true
+}
+```
+
+## Argument reference
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `enabled` (Boolean) When set, mail notifications are enabled.
+- `host` (String) The mail server IP address / DNS.
+- `port` (Number) The port number of the mail server.
+
+### Optional
+
+- `artifactory_url` (String) The Artifactory URL to to link to in all outgoing messages.
+- `from` (String) The 'from' address header to use in all outgoing messages.
+- `password` (String) The password for authentication with the mail server.
+- `subject_prefix` (String) A prefix to use for the subject of all outgoing mails.
+- `use_ssl` (Boolean) When set to 'true', uses a secure connection to the mail server.
+- `use_tls` (Boolean) When set to 'true', uses Transport Layer Security when connecting to the mail server.
+- `username` (String) The username for authentication with the mail server.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import artifactory_mail_server.my-mail-server mymailserver
+```
+
+~>The `password` attribute is not retrievable from Artifactory thus there will be state drift after importing this resource.
diff --git a/examples/resources/artifactory_mail_server/import.sh b/examples/resources/artifactory_mail_server/import.sh
@@ -0,0 +1 @@
+terraform import artifactory_mail_server.my-mail-server mymailserver
diff --git a/examples/resources/artifactory_mail_server/resource.tf b/examples/resources/artifactory_mail_server/resource.tf
@@ -0,0 +1,12 @@
+resource "artifactory_mail_server" "mymailserver" {
+    enabled         = true
+    artifactory_url = "http://tempurl.org"
+    from            = "[email protected]"
+    host            = "http://tempurl.org"
+    username        = "test-user"
+    password        = "test-password"
+    port            = 25
+    subject_prefix  = "[Test]"
+    use_ssl         = true
+    use_tls         = true
+}
diff --git a/go.mod b/go.mod
@@ -10,13 +10,13 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/terraform-plugin-docs v0.16.0
 	github.com/hashicorp/terraform-plugin-framework v1.3.5
-	github.com/hashicorp/terraform-plugin-framework-validators v0.10.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-go v0.18.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-mux v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.28.0
 	github.com/hashicorp/terraform-plugin-testing v1.5.1
-	github.com/jfrog/terraform-provider-shared v1.19.0
+	github.com/jfrog/terraform-provider-shared v1.20.0
 	github.com/sethvargo/go-password v0.2.0
 	github.com/stretchr/testify v1.7.2
 	golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819

diff --git a/go.sum b/go.sum
@@ -91,8 +91,8 @@ github.com/hashicorp/terraform-plugin-docs v0.16.0 h1:UmxFr3AScl6Wged84jndJIfFcc
 github.com/hashicorp/terraform-plugin-docs v0.16.0/go.mod h1:M3ZrlKBJAbPMtNOPwHicGi1c+hZUh7/g0ifT/z7TVfA=
 github.com/hashicorp/terraform-plugin-framework v1.3.5 h1:FJ6s3CVWVAxlhiF/jhy6hzs4AnPHiflsp9KgzTGl1wo=
 github.com/hashicorp/terraform-plugin-framework v1.3.5/go.mod h1:2gGDpWiTI0irr9NSTLFAKlTi6KwGti3AoU19rFqU30o=
-github.com/hashicorp/terraform-plugin-framework-validators v0.10.0 h1:4L0tmy/8esP6OcvocVymw52lY0HyQ5OxB7VNl7k4bS0=
-github.com/hashicorp/terraform-plugin-framework-validators v0.10.0/go.mod h1:qdQJCdimB9JeX2YwOpItEu+IrfoJjWQ5PhLpAOMDQAE=
+github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
+github.com/hashicorp/terraform-plugin-framework-validators v0.12.0/go.mod h1:jfHGE/gzjxYz6XoUwi/aYiiKrJDeutQNUtGQXkaHklg=
 github.com/hashicorp/terraform-plugin-go v0.18.0 h1:IwTkOS9cOW1ehLd/rG0y+u/TGLK9y6fGoBjXVUquzpE=
 github.com/hashicorp/terraform-plugin-go v0.18.0/go.mod h1:l7VK+2u5Kf2y+A+742GX0ouLut3gttudmvMgN0PA74Y=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
@@ -116,8 +116,8 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
-github.com/jfrog/terraform-provider-shared v1.19.0 h1:4/CgvSTqhf00eHMo8q+xL2/N8Lng7T+Pw5GbNSUwxRs=
-github.com/jfrog/terraform-provider-shared v1.19.0/go.mod h1:JvTKRAXMQyX6gQjESY+YK2lJLeW8uKTVHar5HDTnvp0=
+github.com/jfrog/terraform-provider-shared v1.20.0 h1:T5AFbn4Su3tlNZTIXwb8Bi4vq/LZMFH312V2z8d3IsI=
+github.com/jfrog/terraform-provider-shared v1.20.0/go.mod h1:KEYnVOggRuQT6qLR05ra0QfQa0SeYnkMnN0ZqIgQHqI=
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

diff --git a/pkg/artifactory/provider/framework.go b/pkg/artifactory/provider/framework.go
@@ -127,7 +127,7 @@ func (p *ArtifactoryProvider) Configure(ctx context.Context, req provider.Config
 			fmt.Sprintf("%v", err),
 		)
 	}
-	if config.CheckLicense.IsNull() || config.CheckLicense.ValueBool() == true {
+	if config.CheckLicense.IsNull() || config.CheckLicense.ValueBool() {
 		licenseErr := utilsdk.CheckArtifactoryLicense(restyBase, "Enterprise", "Commercial", "Edge")
 		if licenseErr != nil {
 			resp.Diagnostics.AddError(
@@ -159,7 +159,6 @@ func (p *ArtifactoryProvider) Configure(ctx context.Context, req provider.Config
 		Client:             restyBase,
 		ArtifactoryVersion: version,
 	}
-
 }
 
 // Resources satisfies the provider.Provider interface for ArtifactoryProvider.
@@ -176,6 +175,7 @@ func (p *ArtifactoryProvider) Resources(ctx context.Context) []func() resource.R
 		configuration.NewLdapSettingResource,
 		configuration.NewLdapGroupSettingResource,
 		configuration.NewBackupResource,
+		configuration.NewMailServerResource,
 	}
 }
 

diff --git a/pkg/artifactory/provider/provider.go b/pkg/artifactory/provider/provider.go
@@ -0,0 +1,4 @@
+package provider
+
+var Version = "9.0.0" // needs to be exported so make file can update this
+var productId = "terraform-provider-artifactory/" + Version
diff --git a/pkg/artifactory/provider/sdkv2.go b/pkg/artifactory/provider/sdkv2.go
@@ -13,9 +13,6 @@ import (
 	"github.com/jfrog/terraform-provider-shared/validator"
 )
 
-var Version = "7.0.0" // needs to be exported so make file can update this
-var productId = "terraform-provider-artifactory/" + Version
-
 // SdkV2 Artifactory provider that supports configuration via Access Token
 // Supported resources are repos, users, groups, replications, and permissions
 func SdkV2() *schema.Provider {

diff --git a/pkg/artifactory/resource/configuration/resource_artifactory_backup.go b/pkg/artifactory/resource/configuration/resource_artifactory_backup.go
@@ -18,7 +18,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	utilfw "github.com/jfrog/terraform-provider-shared/util/fw"
 	utilsdk "github.com/jfrog/terraform-provider-shared/util/sdk"
-	validatorfw "github.com/jfrog/terraform-provider-shared/validator/fw"
+	validatorfw_string "github.com/jfrog/terraform-provider-shared/validator/fw/string"
 
 	"gopkg.in/yaml.v3"
 )
@@ -136,7 +136,7 @@ func (r *BackupResource) Schema(ctx context.Context, req resource.SchemaRequest,
 				MarkdownDescription: "Cron expression to control the backup frequency.",
 				Required:            true,
 				Validators: []validator.String{
-					validatorfw.IsCron(),
+					validatorfw_string.IsCron(),
 				},
 			},
 			"retention_period_hours": schema.Int64Attribute{

diff --git a/pkg/artifactory/resource/configuration/resource_artifactory_backup_test.go b/pkg/artifactory/resource/configuration/resource_artifactory_backup_test.go
@@ -106,7 +106,7 @@ func TestAccBackup_importNotFound(t *testing.T) {
 	`
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5MuxProviderFactories,
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config:        config,
@@ -134,12 +134,12 @@ func TestAccBackup_invalid_cron(t *testing.T) {
 	`
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5MuxProviderFactories,
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config:       config,
 				ResourceName: "artifactory_backup.invalid-cron-test",
-				ExpectError:  regexp.MustCompile("value must match be a valid cron expression"),
+				ExpectError:  regexp.MustCompile("value must be a valid cron expression"),
 			},
 		},
 	})
@@ -180,7 +180,7 @@ func cronTestCase(cronExpression string, t *testing.T) (*testing.T, resource.Tes
 
 	return t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5MuxProviderFactories,
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		CheckDestroy:             acctest.VerifyDeleted(fqrn, acctest.CheckRepo),
 		Steps: []resource.TestStep{
 			{