resolved conflicts

Signed-off-by: Soumyodeep Karmakar <soumyo.k13@gmail.com>

.envrc-example

@@ -1,7 +1,7 @@
-export WORKSPACE=`whoami`
-export ATTRIBUTES_FILE=.$WORKSPACE-attributes.yml
+# export WORKSPACE=`whoami`
+# export ATTRIBUTES_FILE=.$WORKSPACE-attributes.yml
 
-export AZURE_SUBSCRIPTION_ID=
-export AZURE_CLIENT_ID=
-export AZURE_TENANT_ID=
-export AZURE_CLIENT_SECRET=
+# export AZURE_SUBSCRIPTION_ID="AZURE_SUBSCRIPTION_ID"
+# export AZURE_CLIENT_ID="AZURE_CLIENT_ID"
+# export AZURE_TENANT_ID="AZURE_TENANT_ID"
+# export AZURE_CLIENT_SECRET="AZURE_CLIENT_SECRET"

.expeditor/buildkite/verify.sh

@@ -7,13 +7,45 @@ uname -a
 ruby -v
 bundle --version
 
+if [ -n "${CI_ENABLE_COVERAGE:-}" ]; then
+  # Fetch token from vault ASAP so that long-running tests don't cause our vault token to expire
+  echo "--- installing vault"
+  export VAULT_VERSION=1.9.3
+  export VAULT_HOME=$HOME/vault
+  curl --create-dirs -sSLo $VAULT_HOME/vault.zip https://releases.hashicorp.com/vault/$VAULT_VERSION/vault_${VAULT_VERSION}_linux_amd64.zip
+  unzip -o $VAULT_HOME/vault.zip -d $VAULT_HOME
+
+  echo "--- fetching Sonar token from vault"
+  export SONAR_TOKEN=$($VAULT_HOME/vault kv get -field token secret/inspec/sonar)
+fi
+
 echo "--- bundle install"
 bundle config set --local without tools maintenance deploy
 bundle install --jobs=7 --retry=3
-bundle update
 
 echo "+++ bundle exec rake lint"
 bundle exec rake lint
 
 echo "+++ bundle exec rake test:unit"
 bundle exec rake test:unit
+RAKE_EXIT=$?
+
+# If coverage is enabled, then we need to pick up the coverage/coverage.json file
+if [ -n "${CI_ENABLE_COVERAGE:-}" ]; then
+  echo "--- installing sonarscanner"
+  export SONAR_SCANNER_VERSION=4.6.2.2472
+  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
+  curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
+  unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+  export PATH=$SONAR_SCANNER_HOME/bin:$PATH
+  export SONAR_SCANNER_OPTS="-server"
+
+  echo "--- running sonarscanner"
+  sonar-scanner \
+  -Dsonar.organization=inspec \
+  -Dsonar.projectKey=inspec_inspec-azure \
+  -Dsonar.sources=. \
+  -Dsonar.host.url=https://sonarcloud.io
+fi
+
+exit $RAKE_EXIT

.expeditor/config.yml

@@ -9,7 +9,6 @@ slack:
 pipelines:
  - verify:
     description: Pull Request validation tests
-    public: true
 
 github:
  delete_branch_on_merge: true
@@ -19,7 +18,7 @@ github:
 
 release_branches:
   - main
- 
+
 changelog:
  categories:
   - "Type: New Resource": "New Resources"

.expeditor/publish-release-notes.sh

@@ -4,18 +4,15 @@ set -eou pipefail
 
 PRODUCT=inspec-azure
 CURRENTDATE=$(date +"%Y-%m-%d")
-DOCS_DIR="docs-chef-io/static/release-notes/inspec-azure"
+DOCS_ASSETS_DIR="docs-chef-io/assets/release-notes/inspec-azure"
 BRANCH="expeditor/update_release_notes_${CURRENTDATE}"
 
 git checkout -b "$BRANCH"
 
 git clone "https://x-access-token:${GITHUB_TOKEN}@github.com/inspec/inspec-azure.wiki.git"
 
-# Copy release notes from the wiki into the Hugo static directory
-cp inspec-azure.wiki/Pending-Release-Notes.md ${DOCS_DIR}/${CURRENTDATE}.md
-
-# Append the date to the array of dates in docs-chef-io/static/release-notes/inspec-azure/release-dates.json
-DATES_FILE="${DOCS_DIR}/release-dates.json"
+# Append the date to the array of dates in docs-chef-io/assets/release-notes/inspec-azure/release-dates.json
+DATES_FILE="${DOCS_ASSETS_DIR}/release-dates.json"
 DATES=$( cat "$DATES_FILE" | jq --arg DATE "$CURRENTDATE" '. |= .+ [$DATE]' )
 echo $DATES | jq . > "$DATES_FILE"
 

.expeditor/verify.pipeline.yml

@@ -1,13 +1,18 @@
 ---
+expeditor:
+  defaults:
+    buildkite:
+      timeout_in_minutes: 20
+
 steps:
 
-- label: run-tests-ruby-2.6
+- label: lint-ruby-3.0
   command:
-    - /workdir/.expeditor/buildkite/verify.sh
+    - RAKE_TASK=lint /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: ruby:3.0
 
 - label: run-tests-ruby-2.7
   command:
@@ -16,3 +21,12 @@ steps:
     executor:
       docker:
         image: ruby:2.7-buster
+
+- label: run-tests-ruby-3.0
+  command:
+    - CI_ENABLE_COVERAGE=1 /workdir/.expeditor/buildkite/verify.sh
+  expeditor:
+    secrets: true
+    executor:
+      docker:
+        image: ruby:3.0

.gitignore

@@ -16,3 +16,4 @@ dev/
 .ruby-version
 .rakeTasks
 .DS_Store
+coverage

CHANGELOG.md

@@ -1,10 +1,251 @@
 # Changelog
-<!-- latest_release 1.84.1 -->
+<!-- latest_release 1.112.0 -->
+## [v1.112.0](https://github.com/inspec/inspec-azure/tree/v1.112.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-117 Support azure service fabric mesh service [#579](https://github.com/inspec/inspec-azure/pull/579) ([sathish-progress](https://github.com/sathish-progress))
+<!-- latest_release -->
+
+## [v1.111.0](https://github.com/inspec/inspec-azure/tree/v1.111.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-116 Support azure service fabric mesh service replicas [#580](https://github.com/inspec/inspec-azure/pull/580) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.110.0](https://github.com/inspec/inspec-azure/tree/v1.110.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-114 Support azure service fabric mesh volumes [#581](https://github.com/inspec/inspec-azure/pull/581) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.109.0](https://github.com/inspec/inspec-azure/tree/v1.109.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-118 Support azure service fabric mesh apps [#578](https://github.com/inspec/inspec-azure/pull/578) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.108.0](https://github.com/inspec/inspec-azure/tree/v1.108.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-132 Support managed applications [#575](https://github.com/inspec/inspec-azure/pull/575) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.107.0](https://github.com/inspec/inspec-azure/tree/v1.107.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-124 Support service bus regions [#566](https://github.com/inspec/inspec-azure/pull/566) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.106.0](https://github.com/inspec/inspec-azure/tree/v1.106.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-122 Support service bus subscriptions [#568](https://github.com/inspec/inspec-azure/pull/568) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.105.0](https://github.com/inspec/inspec-azure/tree/v1.105.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-123 Support servicebus subscription rules [#567](https://github.com/inspec/inspec-azure/pull/567) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.104.0](https://github.com/inspec/inspec-azure/tree/v1.104.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-121 Support azure service bus topics [#565](https://github.com/inspec/inspec-azure/pull/565) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.103.0](https://github.com/inspec/inspec-azure/tree/v1.103.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-129 Support service bus namespaces [#562](https://github.com/inspec/inspec-azure/pull/562) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.102.0](https://github.com/inspec/inspec-azure/tree/v1.102.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-145 Support azure power bi dataflow storage accounts [#549](https://github.com/inspec/inspec-azure/pull/549) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.101.0](https://github.com/inspec/inspec-azure/tree/v1.101.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-148 Support azure power bi capacity workloads [#534](https://github.com/inspec/inspec-azure/pull/534) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.100.0](https://github.com/inspec/inspec-azure/tree/v1.100.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-152 Support azure power bi app reports [#529](https://github.com/inspec/inspec-azure/pull/529) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.99.0](https://github.com/inspec/inspec-azure/tree/v1.99.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-153 Support azure power bi app dashboards [#521](https://github.com/inspec/inspec-azure/pull/521) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.98.0](https://github.com/inspec/inspec-azure/tree/v1.98.0) (2022-03-12)
+
+#### Merged Pull Requests
+- RESOURCE-157 Support power bi embedded capacities [#487](https://github.com/inspec/inspec-azure/pull/487) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.97.1](https://github.com/inspec/inspec-azure/tree/v1.97.1) (2022-03-02)
+
+#### Merged Pull Requests
+- Removes the unwanted warnings from the integration tests [#643](https://github.com/inspec/inspec-azure/pull/643) ([soumyo13](https://github.com/soumyo13))
+
+## [v1.97.0](https://github.com/inspec/inspec-azure/tree/v1.97.0) (2022-02-28)
+
+#### Merged Pull Requests
+- RESOURCE-139 Support adls paths [#485](https://github.com/inspec/inspec-azure/pull/485) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.96.1](https://github.com/inspec/inspec-azure/tree/v1.96.1) (2022-02-25)
+
+#### Merged Pull Requests
+- Update resource docs for Hugo [#642](https://github.com/inspec/inspec-azure/pull/642) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.96.0](https://github.com/inspec/inspec-azure/tree/v1.96.0) (2022-02-25)
+
+#### Merged Pull Requests
+- RESOURCE-140 Support Azure Power BI dataset datasources [#538](https://github.com/inspec/inspec-azure/pull/538) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.95.0](https://github.com/inspec/inspec-azure/tree/v1.95.0) (2022-02-25)
+
+#### Merged Pull Requests
+- RESOURCE-143 Support power bi dashboard tiles [#516](https://github.com/inspec/inspec-azure/pull/516) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.94.1](https://github.com/inspec/inspec-azure/tree/v1.94.1) (2022-02-25)
+
+#### Merged Pull Requests
+- RESOURCE-136 F/df ds [#506](https://github.com/inspec/inspec-azure/pull/506) ([sa-progress](https://github.com/sa-progress))
+
+## [v1.94.0](https://github.com/inspec/inspec-azure/tree/v1.94.0) (2022-02-25)
+
+#### Merged Pull Requests
+- RESOURCE-144 Support power bi dashboards [#507](https://github.com/inspec/inspec-azure/pull/507) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.93.1](https://github.com/inspec/inspec-azure/tree/v1.93.1) (2022-02-23)
+
+#### Merged Pull Requests
+- Resource-202 update azure tests to use ruby versions 2.7 and 3.0 only  [#641](https://github.com/inspec/inspec-azure/pull/641) ([soumyo13](https://github.com/soumyo13))
+
+## [v1.93.0](https://github.com/inspec/inspec-azure/tree/v1.93.0) (2022-02-22)
+
+#### Merged Pull Requests
+- Support azure migrate db instances [#440](https://github.com/inspec/inspec-azure/pull/440) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.92.5](https://github.com/inspec/inspec-azure/tree/v1.92.5) (2022-02-21)
+
+#### Merged Pull Requests
+- Munge docs content so we can deploy it on docs.chef.io  [#640](https://github.com/inspec/inspec-azure/pull/640) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.92.4](https://github.com/inspec/inspec-azure/tree/v1.92.4) (2022-02-20)
+
+#### Merged Pull Requests
+- RESOURCE-33 Fetch sonar token as early as possible [#638](https://github.com/inspec/inspec-azure/pull/638) ([clintoncwolfe](https://github.com/clintoncwolfe))
+
+## [v1.92.3](https://github.com/inspec/inspec-azure/tree/v1.92.3) (2022-02-19)
+
+#### Merged Pull Requests
+- RESOURCE-109 Support sql vm groups [#595](https://github.com/inspec/inspec-azure/pull/595) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.92.2](https://github.com/inspec/inspec-azure/tree/v1.92.2) (2022-02-19)
+
+#### Merged Pull Requests
+- RESOURCE-110 Support availability group listeners sql vm [#596](https://github.com/inspec/inspec-azure/pull/596) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.92.1](https://github.com/inspec/inspec-azure/tree/v1.92.1) (2022-02-19)
+
+#### Merged Pull Requests
+- RESOURCE-111 Support sql vms [#594](https://github.com/inspec/inspec-azure/pull/594) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.92.0](https://github.com/inspec/inspec-azure/tree/v1.92.0) (2022-02-18)
+
+#### Merged Pull Requests
+- RESOURCE-141 Support azure power bi datasets [#536](https://github.com/inspec/inspec-azure/pull/536) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.91.0](https://github.com/inspec/inspec-azure/tree/v1.91.0) (2022-02-18)
+
+#### Merged Pull Requests
+- RESOURCE-142 Support power bi dataflows [#535](https://github.com/inspec/inspec-azure/pull/535) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.90.0](https://github.com/inspec/inspec-azure/tree/v1.90.0) (2022-02-18)
+
+#### Merged Pull Requests
+- RESOURCE-149 Support azure power bi capacity refreshables [#533](https://github.com/inspec/inspec-azure/pull/533) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.89.0](https://github.com/inspec/inspec-azure/tree/v1.89.0) (2022-02-18)
+
+#### Merged Pull Requests
+- RESOURCE-150 Support power bi capacities [#532](https://github.com/inspec/inspec-azure/pull/532) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.88.0](https://github.com/inspec/inspec-azure/tree/v1.88.0) (2022-02-18)
+
+#### Merged Pull Requests
+- RESOURCE-151 Support azure power bi app dashboard tiles [#528](https://github.com/inspec/inspec-azure/pull/528) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.87.2](https://github.com/inspec/inspec-azure/tree/v1.87.2) (2022-02-18)
+
+#### Merged Pull Requests
+-  Munge docs content so we can deploy it on docs.chef.io [#639](https://github.com/inspec/inspec-azure/pull/639) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.87.1](https://github.com/inspec/inspec-azure/tree/v1.87.1) (2022-02-17)
+
+#### Merged Pull Requests
+- RESOURCE-134 F/pipeline runs [#514](https://github.com/inspec/inspec-azure/pull/514) ([sa-progress](https://github.com/sa-progress))
+
+## [v1.87.0](https://github.com/inspec/inspec-azure/tree/v1.87.0) (2022-02-17)
+
+#### Merged Pull Requests
+- RESOURCE-154 Support azure power bi apps [#519](https://github.com/inspec/inspec-azure/pull/519) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.86.5](https://github.com/inspec/inspec-azure/tree/v1.86.5) (2022-02-16)
+
+#### Merged Pull Requests
+- Add code to run SonarScanner on test unit runs [#634](https://github.com/inspec/inspec-azure/pull/634) ([clintoncwolfe](https://github.com/clintoncwolfe))
+
+## [v1.86.4](https://github.com/inspec/inspec-azure/tree/v1.86.4) (2022-02-15)
+
+#### Merged Pull Requests
+- Update rubocop requirement from ~&gt; 1.24.0 to ~&gt; 1.25.1 [#635](https://github.com/inspec/inspec-azure/pull/635) ([dependabot[bot]](https://github.com/dependabot[bot]))
+
+## [v1.86.3](https://github.com/inspec/inspec-azure/tree/v1.86.3) (2022-02-10)
+
+#### Merged Pull Requests
+- RESOURCE-31 Add SimpleCov [#633](https://github.com/inspec/inspec-azure/pull/633) ([clintoncwolfe](https://github.com/clintoncwolfe))
+
+## [v1.86.2](https://github.com/inspec/inspec-azure/tree/v1.86.2) (2022-02-09)
+
+#### Merged Pull Requests
+- Update rubocop requirement from ~&gt; 1.24.0 to ~&gt; 1.25.1 [#631](https://github.com/inspec/inspec-azure/pull/631) ([dependabot[bot]](https://github.com/dependabot[bot]))
+
+## [v1.86.1](https://github.com/inspec/inspec-azure/tree/v1.86.1) (2022-02-09)
+
+#### Merged Pull Requests
+- Update rubocop requirement from ~&gt; 1.23.0 to ~&gt; 1.24.0 [#597](https://github.com/inspec/inspec-azure/pull/597) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- stick active support to older versions for ruby &lt; 2.7 [#608](https://github.com/inspec/inspec-azure/pull/608) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.86.0](https://github.com/inspec/inspec-azure/tree/v1.86.0) (2022-02-01)
+
+#### Merged Pull Requests
+- Support cache for storage accounts [#628](https://github.com/inspec/inspec-azure/pull/628) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.85.0](https://github.com/inspec/inspec-azure/tree/v1.85.0) (2022-02-01)
+
+#### Merged Pull Requests
+- Support caching of azure nw sgs [#624](https://github.com/inspec/inspec-azure/pull/624) ([sathish-progress](https://github.com/sathish-progress))
+
+## [v1.84.5](https://github.com/inspec/inspec-azure/tree/v1.84.5) (2022-01-31)
+
+#### Merged Pull Requests
+- Remove release notes from static dir [#629](https://github.com/inspec/inspec-azure/pull/629) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.84.4](https://github.com/inspec/inspec-azure/tree/v1.84.4) (2022-01-24)
+
+#### Merged Pull Requests
+- Fix yaml in resource docs [#625](https://github.com/inspec/inspec-azure/pull/625) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.84.3](https://github.com/inspec/inspec-azure/tree/v1.84.3) (2022-01-07)
+
+#### Merged Pull Requests
+- Publish latest release notes 2022-01-07 [#604](https://github.com/inspec/inspec-azure/pull/604) ([IanMadd](https://github.com/IanMadd))
+
+## [v1.84.2](https://github.com/inspec/inspec-azure/tree/v1.84.2) (2022-01-07)
+
+#### Merged Pull Requests
+- Move release-dates.json file to assets dir [#603](https://github.com/inspec/inspec-azure/pull/603) ([IanMadd](https://github.com/IanMadd))
+
 ## [v1.84.1](https://github.com/inspec/inspec-azure/tree/v1.84.1) (2021-12-09)
 
 #### Merged Pull Requests
 - Resource docs fixes [#577](https://github.com/inspec/inspec-azure/pull/577) ([IanMadd](https://github.com/IanMadd))
-<!-- latest_release -->
 
 ## [v1.84.0](https://github.com/inspec/inspec-azure/tree/v1.84.0) (2021-12-09)