No commit message

godaddy · Jun 5, 2024 · 06b2db8 · 06b2db8
2 parents df59656 + 73d148f
commit 06b2db8
Show file tree

Hide file tree

Showing 86 changed files with 2,667 additions and 2,083 deletions.
diff --git a/.github/actions/run-wss-scan/wss-unified-agent.config b/.github/actions/run-wss-scan/wss-unified-agent.config
@@ -229,7 +229,7 @@ followSymbolicLinks=true
 #scm.pass=
 #scm.ppk=
 #scm.url=https://github.com/godaddy/asherah
-#scm.branch=master
+#scm.branch=main
 #scm.tag=
 #scm.npmInstall=false
 #scm.npmInstallTimeoutMinutes=

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,12 +3,12 @@ name: Continuous Integration
 on:
   push:
     branches:
-      # Push events on master branch
-      - master
+      # Push events on main branch
+      - main
       # Push events to branches matching refs/heads/release-
       - 'release-*'
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 #### Global environment variables
 env:

diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
 
-      - name: Merge master -> {RELEASE_TARGET}
+      - name: Merge main -> {RELEASE_TARGET}
         uses: devmasx/merge-branch@6ec8363d74aad4f1615d1234ae1908b4185c4313
         with:
           type: now
-          head_to_merge: master
+          head_to_merge: main
           target_branch: ${{ github.event.inputs.target }}
           github_token: ${{ secrets.MERGE_TOKEN }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ From a practical perspective, contributions are as simple as:
   - Making changes to your forked repository.
   - When committing, reference your issue (if present) and include a note about the fix.
   - If possible, and if applicable, please also add/update unit tests for your changes.
-  - Push the changes to your fork and submit a pull request to the 'master' branch of the project's repository.
+  - Push the changes to your fork and submit a pull request to the 'main' branch of the project's repository.
 
 If you are new to this process, consider taking a look at the whole flow overview
 [here](https://guides.github.com/activities/forking/).

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![License](https://img.shields.io/github/license/godaddy/asherah.svg)](https://github.com/godaddy/asherah/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/godaddy/asherah.svg)](https://github.com/godaddy/asherah/blob/main/LICENSE)
 [![CircleCI](https://img.shields.io/circleci/build/gh/godaddy/asherah.svg)](https://circleci.com/gh/godaddy/asherah)
 [![Codecov](https://codecov.io/gh/godaddy/asherah/graph/badge.svg)](https://codecov.io/gh/godaddy/asherah)
 

diff --git a/build/go/lint.sh b/build/go/lint.sh
@@ -1,13 +1,7 @@
 #!/usr/bin/env bash
 
-curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.24.0
-./bin/golangci-lint run --config .golangci.yml
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.0
+
+./bin/golangci-lint --version
 
-# golint is designed to return zero even it finds lint
-# https://github.com/golang/lint/issues/65
-# Hence we check if the lint command produced any output. If no output, then no errors were found
-if [[ $(./bin/golangci-lint run --config .golangci.yml) ]]; then
-    exit 1
-else
-    exit 0
-fi
+./bin/golangci-lint run --config .golangci.yml
diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <PackageId>GoDaddy.Asherah.AppEncryption</PackageId>
     <Title>AppEncryption</Title>
@@ -16,7 +16,7 @@
     <!-- Properties related to NuGet packaging: -->
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/godaddy/asherah</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/godaddy/asherah/tree/master/csharp/AppEncryption</RepositoryUrl>
+    <RepositoryUrl>https://github.com/godaddy/asherah/tree/main/csharp/AppEncryption</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/csharp/Logging/Logging/Logging.csproj b/csharp/Logging/Logging/Logging.csproj
@@ -14,7 +14,7 @@
     <!-- Properties related to NuGet packaging: -->
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/godaddy/asherah</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/godaddy/asherah/tree/master/csharp/Logging</RepositoryUrl>
+    <RepositoryUrl>https://github.com/godaddy/asherah/tree/main/csharp/Logging</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <!-- End of Properties related to NuGet packaging: -->
   </PropertyGroup>

diff --git a/csharp/SecureMemory/PlatformNative/PlatformNative.csproj b/csharp/SecureMemory/PlatformNative/PlatformNative.csproj
@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>GoDaddy.Asherah.PlatformNative</PackageId>
-    <Authors>GoDaddy</Authors>
-    <Company>GoDaddy</Company>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>GoDaddy.Asherah.PlatformNative</RootNamespace>
-    <CodeAnalysisRuleSet>../StyleCopCustom.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <PackageProjectUrl>https://github.com/godaddy/asherah</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/godaddy/asherah/tree/master/csharp/SecureMemory/PlatformNative</RepositoryUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>GoDaddy.Asherah.PlatformNative</PackageId>
+    <Authors>GoDaddy</Authors>
+    <Company>GoDaddy</Company>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>GoDaddy.Asherah.PlatformNative</RootNamespace>
+    <CodeAnalysisRuleSet>../StyleCopCustom.ruleset</CodeAnalysisRuleSet>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/godaddy/asherah</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/godaddy/asherah/tree/main/csharp/SecureMemory/PlatformNative</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/csharp/SecureMemory/SecureMemory/SecureMemory.csproj b/csharp/SecureMemory/SecureMemory/SecureMemory.csproj
@@ -12,7 +12,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/godaddy/asherah</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/godaddy/asherah/tree/master/csharp/SecureMemory</RepositoryUrl>
+    <RepositoryUrl>https://github.com/godaddy/asherah/tree/main/csharp/SecureMemory</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/docs/Internals.md b/docs/Internals.md
@@ -64,7 +64,7 @@ Create and write DRR to data persistence
 
 The following diagram summarizes the entire encrypt path.
 
-![Encrypt Flow](https://raw.githubusercontent.com/godaddy/asherah/master/docs/images/encrypt.svg?sanitize=true)
+![Encrypt Flow](https://raw.githubusercontent.com/godaddy/asherah/main/docs/images/encrypt.svg?sanitize=true)
 
 ### Decrypt
 
@@ -105,7 +105,7 @@ Return decrypted data
 
 The following diagram summarizes the entire decrypt path.
 
-![Decrypt Flow](https://raw.githubusercontent.com/godaddy/asherah/master/docs/images/decrypt.svg?sanitize=true)
+![Decrypt Flow](https://raw.githubusercontent.com/godaddy/asherah/main/docs/images/decrypt.svg?sanitize=true)
 
 ### Future Consideration: Queued Rotation