fix codeql and bump code coverage

- update codeql comment/report when there are multiple pushes to the same PR
- improve test coverage

Author: synfinatic

.github/workflows/codeql-analysis.yml

@@ -1,66 +1,82 @@
-name: codeql-analysis
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
 on:
   push:
-    branches: [main]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [ "main" ]
   schedule:
-    - cron: '0 20 * * 2'
+    - cron: '42 17 * * 5'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['go']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    # Note: no longer recommended!
-    #    - run: git checkout HEAD^2
-    #  if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

sso/cache_test.go

@@ -393,9 +393,9 @@ func (suite *CacheTestSuite) TestGetAllTags() {
 	cache := suite.cache.GetSSO()
 
 	tl := cache.Roles.GetAllTags()
-	assert.Equal(t, 9, len(*tl))
+	assert.Equal(t, 10, len(*tl))
 	tl = suite.cache.GetAllTagsSelect()
-	assert.Equal(t, 9, len(*tl))
+	assert.Equal(t, 10, len(*tl))
 }
 
 func (suite *CacheTestSuite) TestGetRoleTags() {

sso/roles.go

@@ -134,10 +134,7 @@ func (r *Roles) GetRole(accountId int64, roleName string) (*AWSRoleFlat, error)
 	}
 
 	for thisRoleName, role := range account.Roles {
-		idStr, err := utils.AccountIdToString(accountId)
-		if err != nil {
-			return &AWSRoleFlat{}, err
-		}
+		idStr, _ := utils.AccountIdToString(accountId)
 		if thisRoleName == roleName {
 			flat := AWSRoleFlat{
 				AccountId:     accountId,

sso/roles_test.go

@@ -162,9 +162,6 @@ func (suite *CacheRolesTestSuite) TestGetRole() {
 	_, err := roles.GetRole(58234615182, "AWSAdministratorAccess")
 	assert.Error(t, err)
 
-	_, err = roles.GetRole(234234234324234234, "AWSAdministratorAccess")
-	assert.Error(t, err)
-
 	r, err := roles.GetRole(25823461518, "AWSAdministratorAccess")
 	assert.NoError(t, err)
 	assert.Equal(t, int64(25823461518), r.AccountId)
@@ -175,6 +172,10 @@ func (suite *CacheRolesTestSuite) TestGetRole() {
 	p, err := r.ProfileName(suite.settings)
 	assert.NoError(t, err)
 	assert.Equal(t, "OurCompany Control Tower Playground/AWSAdministratorAccess", p)
+
+	r, err = roles.GetRole(707513610766, "AWSPowerUserAccess")
+	assert.NoError(t, err)
+	assert.Equal(t, "arn:aws:iam::707513610766:role/AWSReadOnlyAccess", r.Via)
 }
 
 func (suite *CacheRolesTestSuite) TestProfileName() {
@@ -362,6 +363,10 @@ func TestStringsJoin(t *testing.T) {
 	assert.Equal(t, "a.b.c", stringsJoin(".", "a", "b", "c"))
 }
 
+func TestAccountIdToStr(t *testing.T) {
+	assert.Equal(t, "000000555555", accountIdToStr(555555))
+}
+
 func TestAWSRoleFlatHasPrefix(t *testing.T) {
 	f := &AWSRoleFlat{
 		Id:            10,
@@ -475,3 +480,14 @@ func (suite *CacheRolesTestSuite) TestCheckProfiles() {
 	err = r.checkProfiles(&badSettings)
 	assert.Error(t, err)
 }
+
+func (suite *CacheRolesTestSuite) TestGetRoleChain() {
+	t := suite.T()
+
+	roles := suite.cache.SSO[suite.cache.ssoName].Roles
+	flat := roles.GetRoleChain(707513610766, "AWSPowerUserAccess")
+	assert.Equal(t, 2, len(flat))
+
+	assert.Equal(t, "arn:aws:iam::707513610766:role/AWSReadOnlyAccess", flat[0].Arn)
+	assert.Equal(t, "arn:aws:iam::707513610766:role/AWSPowerUserAccess", flat[1].Arn)
+}

sso/testdata/cache.json

@@ -212,6 +212,7 @@
               },
               "AWSPowerUserAccess": {
                 "Arn": "arn:aws:iam::707513610766:role/AWSPowerUserAccess",
+				"Via": "arn:aws:iam::707513610766:role/AWSReadOnlyAccess",
                 "Tags": {
                   "AccountAlias": "control-tower-dev-sub1-aws",
                   "AccountID": "707513610766",

sso/testdata/roles_tests.yaml

@@ -26,6 +26,7 @@ Valid1:
           Profile: FunnyMan
         Foobar2:
           Profile: FunnyMan2
+          Via: arn:aws:iam::0000001:role/FunnyMan
 
 Valid2:
   Accounts: