Merge pull request #488 from sassoftware/staging

10.3.1 - April 23, 2025

Author: saschjmil

CONTRIBUTING.md

@@ -15,13 +15,54 @@ review. Our review process typically involves performing unit tests, development
 tests, integration tests, and security scans.
 
 ## Pull Request Requirement
-All contributions (PRs) must be accompanied by passing unit and/or integration
-tests, following our  [testing philosophy](./docs/user/TestingPhilosophy.md). If you are unfamiliar with this process,
-we are happy to help you navigate it by providing continuous collaboration within the pull request.
-All pull requests must also pass our linter analysis checks. Contributions might
-be subjected to security scans before they can be accepted.
+
+### Automated Tests
+All contributors are expected to include appropriate tests to ensure code quality
+and maintainability. This may include unit and/or integration tests as applicable
+to the scope of the changes.  We have a developed a Golang testing framework using
+[Terratest](https://terratest.gruntwork.io/) for unit tests and are in the process
+of developing integration tests. Please refer to our [Testing Philosopy](./docs/user/TestingPhilosophy.md)
+documentation for more information on our testing framework. If you need additional
+help and guidance, we are happy to help you navigate it by providing continuous
+collaboration within the pull request.
+
+### Conventional Commits
+All pull requests must follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
+standard for commit messages. This helps maintain a consistent and meaningful
+commit history. Pull requests with commits that do not follow the Conventional
+Commit format will not be merged.
+
+### Developer Certificate of Origin Sign-Off
+This project requires all commits to be signed off in accordance with the [Developer Certificate of Origin (DCO)](https://developercertificate.org/).
+By signing off your commits, you certify that you have the right to submit the
+contribution under the open source license used by this project.
+
+To sign off your commits, use the --signoff flag with git commit:
+
+```bash
+git commit --signoff -m "Your commit message"
+```
+
+This will add a Signed-off-by line to your commit message, e.g.:
+
+```bash
+Signed-off-by: You Name <your.email@example.com>
+```
+
+For more information, please refer to https://probot.github.io/apps/dco/
+
+### Linter Analysis Checks
+All pull requests must pass our automated analysis checks before they can be
+merged. These checks include:
+
+- **Hadolint** – for Dockerfile best practices
+- **ShellCheck** – for shell script issues
+- **TFLint** – for Terraform code quality
+- **Gitleaks** – for detecting hardcoded secrets and sensitive information
 
 ## Security Scans
-To ensure that all submissions meet our security and quality standards, we perform security
-scans using internal SAS infrastructure. Reporting of any Common Vulnerabilities and Exposures
-(CVEs) that are detected is not available in this project at this time.
+To ensure that all submissions meet our security and quality standards, we perform
+security scans using internal SAS infrastructure. Contributions might be subjected
+to security scans before they can be accepted. Reporting of any Common Vulnerabilities
+and Exposures (CVEs) that are detected is not available in this project at this
+time.

docs/CONFIG-VARS.md

@@ -387,7 +387,7 @@ Each server element, like `foo = {}`, can contain none, some, or all of the para
 | server_version | The version of the PostgreSQL Flexible server instance | string | "15" | Refer to the [SAS Viya Platform Administration Guide](https://documentation.sas.com/?cdcId=sasadmincdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#p1wq8ouke3c6ixn1la636df9oa1u) for the supported versions of PostgreSQL for the SAS Viya platform. |
 | ssl_enforcement_enabled | Enforce SSL on connection to the Azure Database for PostgreSQL Flexible server instance | bool | true | |
 | connectivity_method | Network connectivity option to connect to your flexible server. There are two connectivity options available: Public access (allowed IP addresses) and Private access (VNet Integration). Defaults to public access with firewall rules enabled.| string | "public" | Valid options are `public` and `private`. See sample input file [here](../examples/sample-input-postgres.tfvars) and Private access documentation [here](./user/PostgreSQLPrivateAccess.md). For more details see [Networking overview](https://learn.microsoft.com/en-us/azure/postgresql/flexible-server/concepts-networking) |
-| postgresql_configurations | Sets a PostgreSQL Configuration value on a Azure PostgreSQL Flexible Server | list(object) | [{ name : "azure.extensions", value : "PLPGSQL,PGCRYPTO" }] | More details can be found [here](https://docs.microsoft.com/en-us/azure/postgresql/flexible-server/howto-configure-server-parameters-using-cli) |
+| postgresql_configurations | Sets a PostgreSQL Configuration value on a Azure PostgreSQL Flexible Server | list(object) | [{ name : "azure.extensions", value : "PGCRYPTO" }] | More details can be found [here](https://docs.microsoft.com/en-us/azure/postgresql/flexible-server/howto-configure-server-parameters-using-cli) |
 
 Multiple SAS offerings require a second PostgreSQL instance referred to as SAS Common Data Store, or CDS PostgreSQL. For more information, see [Common Customizations](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=dplyml0phy0dkr&docsetTarget=n08u2yg8tdkb4jn18u8zsi6yfv3d.htm#p0wkxxi9s38zbzn19ukjjaxsc0kl). A list of SAS offerings that require CDS PostgreSQL is provided in [SAS Common Data Store Requirements](https://documentation.sas.com/?cdcId=itopscdc&cdcVersion=default&docsetId=itopssr&docsetTarget=p05lfgkwib3zxbn1t6nyihexp12n.htm#n03wzanutmc6gon1val5fykas9aa). To create and configure an external CDS PostgreSQL instance in addition to the external platform PostgreSQL instance named `default`, specify `cds-postgres` as a second PostgreSQL instance, as shown in the example below.
 
@@ -400,7 +400,7 @@ postgres_servers = {
     postgresql_configurations    = [
        {
          name  = "azure.extensions"
-         value = "PLPGSQL,PGCRYPTO,LTREE"
+         value = "PGCRYPTO,LTREE"
        }
       ]
   },

test/nondefaultplan/rbac_test.go

@@ -4,9 +4,10 @@
 package nondefaultplan
 
 import (
-	"github.com/stretchr/testify/assert"
 	"test/helpers"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPlanRbacEnabledGroupIds(t *testing.T) {
@@ -44,7 +45,7 @@ func TestPlanRbacEnabledGroupIds(t *testing.T) {
 	helpers.RunTests(t, tests, plan)
 }
 
-func TestNonDefaultRbacEnabledWithTenant(t *testing.T) {
+func TestPlanRbacEnabledWithTenant(t *testing.T) {
 	t.Parallel()
 
 	const TENANT_ID = "b1c14d5c-3625-45b3-a430-9552373a0c2f"
@@ -87,7 +88,7 @@ func TestNonDefaultRbacEnabledWithTenant(t *testing.T) {
 	helpers.RunTests(t, tests, plan)
 }
 
-func TestNonDefaultAzureRbacEnabledWithTenant(t *testing.T) {
+func TestPlanAzureRbacEnabledWithTenant(t *testing.T) {
 	t.Parallel()
 
 	const TENANT_ID = "b1c14d5c-3625-45b3-a430-9552373a0c2f"

variables.tf

@@ -310,7 +310,7 @@ variable "postgres_server_defaults" {
     server_version               = "15"
     ssl_enforcement_enabled      = true
     connectivity_method          = "public"
-    postgresql_configurations    = [{ name : "azure.extensions", value : "PLPGSQL,PGCRYPTO" }]
+    postgresql_configurations    = [{ name : "azure.extensions", value : "PGCRYPTO" }]
   }
 }