Commit 56a70bb
committed
Add ConsentToRecurringPAYG support and role assignment retry logic
Sync changes from claestom/sql-arc-policy-license-config into the
sql-server-samples fork.
azurepolicy.json:
- Add ConsentToRecurringPAYG compliance checks in existenceCondition:
when target is PAYG, resources must also have the consent property
to be considered compliant (handles both new transitions and
backward compatibility for pre-consent PAYG extensions)
- Add ConsentToRecurringPAYG to the deployment template: when target
is PAYG, the remediation sets Consented=true with a UTC timestamp;
non-PAYG targets use the base LicenseType-only settings
- Add consentTimestamp template parameter (auto-generated via utcNow)
deployment.ps1:
- Add retry loop (5 attempts, 10s delay) for managed identity role
assignments to handle replication delays after policy assignment
creation; also handles Conflict responses gracefully
README.md:
- Add Recurring Billing Consent (PAYG) section documenting the
consent behavior, compliance evaluation, and immutability note1 parent bdc1ebf commit 56a70bb
3 files changed
Lines changed: 72 additions & 9 deletions
File tree
- samples/manage/azure-arc-enabled-sql-server/compliance/arc-sql-license-type-compliance
- policy
- scripts
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
154 | 162 | | |
155 | 163 | | |
156 | 164 | | |
| |||
Lines changed: 41 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
115 | 135 | | |
116 | 136 | | |
117 | 137 | | |
| |||
156 | 176 | | |
157 | 177 | | |
158 | 178 | | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
159 | 183 | | |
160 | 184 | | |
161 | 185 | | |
| |||
214 | 238 | | |
215 | 239 | | |
216 | 240 | | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
217 | 248 | | |
218 | 249 | | |
219 | 250 | | |
220 | 251 | | |
221 | 252 | | |
222 | | - | |
| 253 | + | |
223 | 254 | | |
224 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
225 | 264 | | |
226 | 265 | | |
227 | 266 | | |
| |||
Lines changed: 23 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
119 | 135 | | |
120 | 136 | | |
121 | 137 | | |
| |||
0 commit comments