Merge pull request #209 from deploymenttheory/feat_intune_settings_te…

…mplates Feat intune settings templates
deploymenttheory · Nov 18, 2024 · 0612c82 · 0612c82
2 parents cbd3e7a + 756e3da
commit 0612c82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/terraform-docs.yml b/.github/workflows/terraform-docs.yml
@@ -1,8 +1,8 @@
 name: generate terraform docs
 
 on:
-  pull_request:
-    branches:
+  push:
+    branches-ignore:
       - main
     paths-ignore:
       - '.github/**/*'
@@ -24,13 +24,14 @@ jobs:
 
     - uses: actions/checkout@v4.2.2
       with:
-        ref: ${{ github.event.pull_request.head.ref }}
+        ref: ${{ github.ref }}
     # Creates provider documentation for registry.terraform.io
-    - name: Render terraform docs for microsoft365_graph
+    - name: Render terraform docs for microsoft365 graph v1.0 + beta
       uses: terraform-docs/gh-actions@v1.3.0
       with:
-        working-dir: examples/
-        find-dir: .
+        config-file: .terraform-docs.yml
+        find-dir: examples/
+        # recursive: true
         indention: 3
         output-file: README.md
         output-method: inject

diff --git a/internal/resources/_resource_template/state.go b/internal/resources/_resource_template/state.go
@@ -9,7 +9,8 @@ import (
 	graphmodels "github.com/microsoftgraph/msgraph-beta-sdk-go/models"
 )
 
-func MapRemoteStateToTerraform(ctx context.Context, data *ResourceTemplateResourceModel, remoteResource graphmodels.DeviceAndAppManagementAssignmentFilterable) {
+// mapRemoteStateToTerraform maps the remote state to the Terraform state
+func mapRemoteStateToTerraform(ctx context.Context, data *ResourceTemplateResourceModel, remoteResource graphmodels.DeviceAndAppManagementAssignmentFilterable) {
 	if remoteResource == nil {
 		tflog.Debug(ctx, "Remote resource is nil")
 		return