chore: branding changes for the mac installer (#196)

* chore: branding change and run integration tests in a different region

.github/workflows/release.yml

@@ -220,11 +220,18 @@ jobs:
       # Get tag version for release
       - name: Set Version Env Variable
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
+      - name: 'Get Release Details'
+        run: |
+          export RELEASE_DETAILS="$(awk -vN=2 'n<N;/^## /{++n}' CHANGELOG.md)"
+          export RELEASE_DETAILS="$(sed '${/^# /d;}' <<< "$RELEASE_DETAILS")"
+          export RELEASE_DETAILS="$(sed '$d' <<< "$RELEASE_DETAILS")"
+          touch RELEASE_DETAILS.md
+          echo "$RELEASE_DETAILS" > RELEASE_DETAILS.md
       - name: Upload to Draft Release
         uses: ncipollo/release-action@v1
         with:
           draft: true
           name: "AWS ODBC Driver for MySQL - v${{ env.RELEASE_VERSION }}"
+          bodyFile: RELEASE_DETAILS.md
           artifacts: "./*.pkg, ./*.tar.gz, ./*.msi"
           token: ${{ secrets.GITHUB_TOKEN }}

integration/iam_authentication_integration_test.cc

@@ -41,6 +41,7 @@ static char* test_user;
 static char* test_pwd;
 static unsigned int test_port;
 static char* iam_user;
+static char* test_region;
 
 static std::string test_endpoint;
 
@@ -60,6 +61,7 @@ class IamAuthenticationIntegrationTest : public testing::Test {
         test_port = INTEGRATION_TEST_UTILS::str_to_int(
             INTEGRATION_TEST_UTILS::get_env_var("MYSQL_PORT", "3306"));
         iam_user = INTEGRATION_TEST_UTILS::get_env_var("IAM_USER", "john_doe");
+        test_region = INTEGRATION_TEST_UTILS::get_env_var("RDS_REGION", "us-east-2");
 
         auto conn_str_builder = ConnectionStringBuilder();
         auto conn_str = conn_str_builder
@@ -126,7 +128,7 @@ class IamAuthenticationIntegrationTest : public testing::Test {
             .withDatabase(test_db)
             .withEnableClusterFailover(false) // Failover interferes with some of our tests
             .withAuthMode("IAM")
-            .withAuthRegion("us-east-2")
+            .withAuthRegion(test_region)
             .withAuthExpiration(900);
     }
 

integration/secrets_manager_integration_test.cc

@@ -49,7 +49,7 @@ class SecretsManagerIntegrationTest : public testing::Test {
 
     int MYSQL_PORT = INTEGRATION_TEST_UTILS::str_to_int(
         INTEGRATION_TEST_UTILS::get_env_var("MYSQL_PORT", "3306"));
-
+    char* TEST_REGION = INTEGRATION_TEST_UTILS::get_env_var("RDS_REGION", "us-east-2");
     std::string MYSQL_CLUSTER_URL = std::getenv("TEST_SERVER");
 
     SQLHENV env = nullptr;
@@ -88,7 +88,7 @@ TEST_F(SecretsManagerIntegrationTest, EnableSecretsManagerWithRegion) {
                             .withDSN(dsn)
                             .withServer(MYSQL_CLUSTER_URL)
                             .withAuthMode("SECRETS MANAGER")
-                            .withAuthRegion("us-east-2")
+                            .withAuthRegion(TEST_REGION)
                             .withSecretId(SECRETS_ARN)
                             .build();
     SQLCHAR conn_out[4096] = "\0";
@@ -139,7 +139,7 @@ TEST_F(SecretsManagerIntegrationTest, EnableSecretsManagerInvalidSecretID) {
                             .withDSN(dsn)
                             .withServer(MYSQL_CLUSTER_URL)
                             .withAuthMode("SECRETS MANAGER")
-                            .withAuthRegion("us-east-2")
+                            .withAuthRegion(TEST_REGION)
                             .withSecretId("invalid-id")
                             .build();
     SQLCHAR conn_out[4096] = "\0";

scripts/macosx/ReadMe.html.in

@@ -15,7 +15,7 @@
     </td>
     <td>
       <b>
-	MySQL Connctor/ODBC
+	AWS ODBC Driver for MySQL
 	<br>
 	@VERSION@
       </b>
@@ -24,7 +24,7 @@
 </table>
 
 <p>
-  This package contains a binary release of MySQL Connector/ODBC for Mac OS X.
+  This package contains a binary release of AWS MYSQL ODBC Driver for Mac OS X.
 </p>
 
 <p>

scripts/macosx/Welcome.html.in

@@ -15,7 +15,7 @@
     </td>
     <td>
       <b>
-	MySQL Connector/ODBC
+	AWS ODBC Driver for MySQL
 	<br>
 	@VERSION@
       </b>
@@ -24,9 +24,9 @@
 </table>
 
 <p>
-  This is the installer for MySQL Connector/ODBC, which allows applications
-  to work with MySQL servers by using the cross-platform, database-agnostic
-  ODBC interface.
+  This is the installer for Amazon Web Services (AWS) ODBC Driver for MySQL. The AWS ODBC Driver for MySQL allows an
+  application to take advantage of the features of clustered MySQL databases.
+  It is based on and can be used as a drop-in compatible for the MySQL Connector/ODBC driver, and is compatible with all MySQL deployments.
 </p>
 
 <br>

scripts/sign_installer.ps1

@@ -113,7 +113,7 @@ function Invoke-SignInstaller {
     # Remove unsigned installer and remove "-signed" in signed installer name
     Write-Host "Removing unsigned executable."
     Remove-Item -Path $unsignedInstallerPath
-    Rename-Item -Path $signedInstallerPath -NewName "awsmysql-odbc-$OdbcVersion-$Architecture.msi"
+    Rename-Item -Path $signedInstallerPath -NewName "aws-mysql-odbc-$OdbcVersion-$Architecture.msi"
 
     return $true
 }

testframework/src/test/java/host/IntegrationContainerTest.java

@@ -288,7 +288,7 @@ private void setupTestContainer(final Network network) throws InterruptedExcepti
       .withEnv("AWS_SECRET_ACCESS_KEY", SECRET_ACCESS_KEY)
       .withEnv("AWS_SESSION_TOKEN", SESSION_TOKEN)
       .withEnv("RDS_ENDPOINT", ENDPOINT == null ? "" : ENDPOINT)
-      .withEnv("RDS_REGION", REGION == null ? "" : "us-east-2")
+      .withEnv("RDS_REGION", REGION == null ? "us-east-2" : REGION)
       .withEnv("TOXIPROXY_CLUSTER_NETWORK_ALIAS", "toxiproxy-instance-cluster")
       .withEnv("TOXIPROXY_RO_CLUSTER_NETWORK_ALIAS", "toxiproxy-ro-instance-cluster")
       .withEnv("PROXIED_DOMAIN_NAME_SUFFIX", PROXIED_DOMAIN_NAME_SUFFIX)