feat: SCIM integration v1 readiness #2846

sfc-gh-jmichalak · 2024-05-31T13:27:59Z

Added missing fields
Renamed fields to match docs
Migrated to Context functions
Added acceptance tests
Fixed handling empty comments in SDK - changed UNSET to SET with empty value

Test Plan

acceptance tests

References

https://docs.snowflake.com/en/sql-reference/sql/create-security-integration-scim

github-actions · 2024-05-31T13:53:55Z

Integration tests failure for 0709ec2afdf9af42beaa836026e03446700c5aef

pkg/resources/scim_integration.go

pkg/resources/scim_integration_acceptance_test.go

pkg/sdk/security_integrations_def.go

pkg/sdk/security_integrations_validations_gen.go

docs/resources/scim_integration.md

pkg/helpers/helpers.go

pkg/sdk/testint/security_integrations_gen_integration_test.go

pkg/resources/scim_integration_acceptance_test.go

github-actions · 2024-06-05T09:52:38Z

Integration tests failure for dbe65c93ed7c1b57f7f539018b68f22cff4a7262

github-actions · 2024-06-05T09:54:23Z

Integration tests failure for dd341afc97af3df0320d3ee327c86aec07df02e3

github-actions · 2024-06-05T11:10:44Z

Integration tests success for 89343b5d25f0c711e4d42e0d308ad6d0befbf05c

pkg/acceptance/helpers/common_test.go

sfc-gh-asawicki · 2024-06-06T09:14:38Z

pkg/acceptance/helpers/common.go

+}
+
+// AssertErrorContainsPartsFunc returns a function asserting error message contains each string in parts
+func AssertErrorContainsPartsFunc(t *testing.T, parts []string) resource.ErrorCheckFunc {


so why do we need a second method doing almost the same thing as the one above?

And also: this one should also be tested, but because assertions are a bit trickier to test (but we have examples in our repository), it does not have to be a part of this PR.

Because for some errors, e.g. missing required fields in config, the order of errors is not deterministic. We get error message as a simple error so the alternative is to parse it and sort messages and I'm not a fan of such implementation. Also, function signatures are different because they are used as resource.TestStep.ExpectError and resource.TestCase.ErrorCheck respectively.

I can add tests in the next PR.

Okay , but why:

do we need ErrorCheck versus ExpectError? Why can't we just use expect error too here?

do we care about the ordering of errors at all then? Maybe one assertion not caring about the ordering would be enough?

pkg/sdk/testint/security_integrations_gen_integration_test.go

pkg/resources/scim_integration.go

pkg/sdk/security_integrations_gen.go

pkg/resources/scim_integration.go

sfc-gh-asawicki · 2024-06-06T09:35:47Z

pkg/resources/scim_integration.go

+		ValidateFunc: validation.StringInSlice(sdk.AsStringList([]sdk.ScimSecurityIntegrationRunAsRoleOption{
+			sdk.ScimSecurityIntegrationRunAsRoleOktaProvisioner, sdk.ScimSecurityIntegrationRunAsRoleAadProvisioner, sdk.ScimSecurityIntegrationRunAsRoleGenericScimProvisioner,
+		}), true),
+		DiffSuppressFunc: ignoreTrimSpaceSuppressFunc,


I was not clear with the previous comment:

Yes, they must be capitalized and we handle it on the SDK level.

We agreed that we allow users to put e.g. lower cased values (this was the previous behavior).

With the old implementation (before your changes) it was allowed, and diff suppression handled also lowercase correctly (and my comment was only about that using ignoreTrimSpaceSuppressFunc breaks it)

pkg/resources/scim_integration_acceptance_test.go

pkg/resources/scim_integration.go

pkg/resources/scim_integration_acceptance_test.go

MIGRATION_GUIDE.md

pkg/resources/scim_integration_acceptance_test.go

pkg/resources/custom_diffs.go

pkg/resources/scim_integration.go

pkg/resources/custom_diffs.go

pkg/resources/scim_integration.go

github-actions · 2024-06-07T09:16:55Z

Integration tests failure for 88a2375010a421e2de2433567d3b9acaf4823f59

github-actions · 2024-06-07T09:48:35Z

Integration tests failure for 88a2375010a421e2de2433567d3b9acaf4823f59

github-actions · 2024-06-07T09:51:28Z

Integration tests failure for a8e0765a7e8b138a421b7c0cf07d5a96c7707f5e

github-actions · 2024-06-07T10:35:56Z

Integration tests failure for 00f0b31d20e29fc400956f7ba374f8a0880e0cbb

github-actions · 2024-06-07T12:08:20Z

Integration tests failure for 7533f4e54c7512641cb0a64957eb5bd070448246

pkg/acceptance/helpers/common.go

pkg/resources/scim_integration.go

pkg/resources/scim_integration_acceptance_test.go

docs/resources/scim_integration.md

github-actions · 2024-06-10T12:40:19Z

Integration tests failure for 3403ca1f831cda790c6ef72163088ebcf0aaf67e

github-actions · 2024-06-10T12:41:03Z

Integration tests failure for c2aa70ece0a46f6382ab06fa51d35854941fdadf

github-actions · 2024-06-10T12:42:44Z

Integration tests failure for e54ed9a97f68800752fe72e249c3c7c779c9f27c

github-actions · 2024-06-11T08:47:01Z

Integration tests failure for 7d9b62c4a95519b8369a0e74b5d31f52701d967e

github-actions · 2024-06-11T09:47:54Z

Integration tests success for 7d9b62c4a95519b8369a0e74b5d31f52701d967e

sfc-gh-asawicki · 2024-06-12T08:37:35Z

pkg/resources/scim_integration_acceptance_test.go

@@ -232,21 +221,21 @@ func TestAcc_ScimIntegration_migrateFromVersion091(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: scimIntegrationv091(id.Name(), role.Name),
+				Config: scimIntegrationv091(id.Name(), role.Name()),


names changed (we already have v0.92)

sfc-gh-asawicki · 2024-06-12T08:38:23Z

pkg/resources/scim_integration_acceptance_test.go

@@ -213,10 +204,8 @@ func TestAcc_ScimIntegration_InvalidIncomplete(t *testing.T) {
 }

 func TestAcc_ScimIntegration_migrateFromVersion091(t *testing.T) {


let's add one more test for migration (with setting enabled to false after and expecting changes) - it may be added in the next PR

sfc-gh-jmichalak · 2024-06-12T08:48:15Z

Merging, unresolved comments will be addressed/discussed in the next PR.

🤖 I have created a release *beep* *boop* --- ## [0.93.0](v0.92.0...v0.93.0) (2024-07-10) ### 🎉 **What's new:** * Add OAUTH integration for custom clients ([#2908](#2908)) ([d9b557f](d9b557f)) * Add oauth integration for partner applications ([#2912](#2912)) ([91788e5](91788e5)) * Add support for cortex search service ([#2860](#2860)) ([43aa89f](43aa89f)) * API Authentication integration v1 readiness ([#2898](#2898)) ([91931da](91931da)) * External Oauth integration v1 readiness ([#2907](#2907)) ([ed237c3](ed237c3)) * Generate show outputs with mappers ([#2886](#2886)) ([1cada88](1cada88)) * Introduce security integrations datasource ([#2892](#2892)) ([7f6c657](7f6c657)) * SAML2 integration v1 readiness ([#2868](#2868)) ([d0c136d](d0c136d)) * SCIM integration v1 readiness ([#2846](#2846)) ([269df6b](269df6b)) * Security integrations datasource v1 readiness ([#2913](#2913)) ([d10474a](d10474a)) * standard database v1 readiness ([#2842](#2842)) ([3c11953](3c11953)) * Warehouse redesign final touches ([#2900](#2900)) ([0eab636](0eab636)) * Warehouse redesign part1 ([#2864](#2864)) ([6664457](6664457)) * Warehouse redesign part2 ([#2887](#2887)) ([1aaf417](1aaf417)) * Warehouse redesign part3 ([#2890](#2890)) ([873a1ed](873a1ed)) * Warehouse redesign part4 ([#2893](#2893)) ([d525fd9](d525fd9)) ### 🔧 **Misc** * Add documentation on unset and defaults ([#2882](#2882)) ([85a7836](85a7836)) * apply minor database changes ([#2872](#2872)) ([6ccac59](6ccac59)) * Apply new resource conventions to scim integration ([#2891](#2891)) ([e11e608](e11e608)) * Improve generator template organization ([#2820](#2820)) ([5035e2f](5035e2f)) * Nuke stale objects ([#2869](#2869)) ([9c4a117](9c4a117)) * Show a possible solution for [#2877](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2877) ([#2878](#2878)) ([6fb437b](6fb437b)) * Validations cleanup and old grants removal ([#2884](#2884)) ([05b7eee](05b7eee)) ### 🐛 **Bug fixes:** * Add disclaimers and fix tests ([#2905](#2905)) ([1deaedc](1deaedc)) * Fix cortex search service ([#2904](#2904)) ([763d06c](763d06c)) * use suppressQuoting to fix stage file_format permadiff ([#2885](#2885)) ([fd70f6e](fd70f6e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: snowflake-release-please[bot] <105954990+snowflake-release-please[bot]@users.noreply.github.com>

scim integration v1 readiness

0709ec2

sfc-gh-jmichalak requested review from sfc-gh-asawicki and sfc-gh-jcieslak May 31, 2024 13:28

sfc-gh-jcieslak reviewed Jun 4, 2024

View reviewed changes

sfc-gh-asawicki requested changes Jun 4, 2024

View reviewed changes

sfc-gh-jmichalak added 3 commits June 5, 2024 10:50

Fixes

dbe65c9

Fix docs

dd341af

Fix test

d0a1b96

Fix tests

89343b5

sfc-gh-asawicki self-requested a review June 6, 2024 07:29

sfc-gh-asawicki reviewed Jun 6, 2024

View reviewed changes

sfc-gh-asawicki requested changes Jun 6, 2024

View reviewed changes

pkg/resources/custom_diffs.go Outdated Show resolved Hide resolved

pkg/resources/scim_integration.go Outdated Show resolved Hide resolved

pkg/resources/custom_diffs.go Outdated Show resolved Hide resolved

sfc-gh-jcieslak reviewed Jun 6, 2024

View reviewed changes

pkg/resources/scim_integration.go Outdated Show resolved Hide resolved

sfc-gh-jmichalak added 3 commits June 6, 2024 15:38

Fix

7f8a877

Fixes

3e91240

Merge remote-tracking branch 'origin/main' into jmichalak-si-v1

88a2375

Fix docs

a8e0765

Fix tests

7533f4e

sfc-gh-jmichalak force-pushed the jmichalak-si-v1 branch from 00f0b31 to 7533f4e Compare June 7, 2024 11:15

sfc-gh-jcieslak reviewed Jun 10, 2024

View reviewed changes

sfc-gh-jmichalak force-pushed the jmichalak-si-v1 branch from 3403ca1 to c2aa70e Compare June 10, 2024 12:38

Fix

e54ed9a

sfc-gh-jmichalak force-pushed the jmichalak-si-v1 branch from c2aa70e to e54ed9a Compare June 10, 2024 12:39

Fix

7d9b62c

sfc-gh-asawicki approved these changes Jun 12, 2024

View reviewed changes

sfc-gh-jcieslak approved these changes Jun 12, 2024

View reviewed changes

sfc-gh-jmichalak merged commit 269df6b into main Jun 12, 2024
9 checks passed

sfc-gh-jmichalak deleted the jmichalak-si-v1 branch June 12, 2024 08:48

snowflake-release-please bot mentioned this pull request Jun 12, 2024

chore(main): release 0.93.0 #2866

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: SCIM integration v1 readiness #2846

feat: SCIM integration v1 readiness #2846

sfc-gh-jmichalak commented May 31, 2024

github-actions bot commented May 31, 2024

github-actions bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024

sfc-gh-asawicki Jun 6, 2024

sfc-gh-jmichalak Jun 6, 2024

sfc-gh-asawicki Jun 12, 2024

sfc-gh-asawicki Jun 6, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 11, 2024

github-actions bot commented Jun 11, 2024

sfc-gh-asawicki Jun 12, 2024

sfc-gh-asawicki Jun 12, 2024

sfc-gh-jmichalak commented Jun 12, 2024

		@@ -213,10 +204,8 @@ func TestAcc_ScimIntegration_InvalidIncomplete(t *testing.T) {
		}

		func TestAcc_ScimIntegration_migrateFromVersion091(t *testing.T) {

feat: SCIM integration v1 readiness #2846

feat: SCIM integration v1 readiness #2846

Conversation

sfc-gh-jmichalak commented May 31, 2024

Test Plan

References

github-actions bot commented May 31, 2024

github-actions bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024

sfc-gh-asawicki Jun 6, 2024

Choose a reason for hiding this comment

sfc-gh-jmichalak Jun 6, 2024

Choose a reason for hiding this comment

sfc-gh-asawicki Jun 12, 2024

Choose a reason for hiding this comment

sfc-gh-asawicki Jun 6, 2024

Choose a reason for hiding this comment

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 7, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 10, 2024

github-actions bot commented Jun 11, 2024

github-actions bot commented Jun 11, 2024

sfc-gh-asawicki Jun 12, 2024

Choose a reason for hiding this comment

sfc-gh-asawicki Jun 12, 2024

Choose a reason for hiding this comment

sfc-gh-jmichalak commented Jun 12, 2024