-
Notifications
You must be signed in to change notification settings - Fork 418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Add SCIM and SAML2 security integrations to sdk #2799
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
ddb81eb
Add SCIM integration to sdk
sfc-gh-jmichalak 0da7cee
Add SAML2 integration to sdk
sfc-gh-jmichalak 68c5b99
Fixes
sfc-gh-jmichalak fe25778
Fix showbyid
sfc-gh-jmichalak 0a0f76d
Merge remote-tracking branch 'origin/main' into jmichalak-security-in…
sfc-gh-jmichalak 0fa4bc1
Use enums
sfc-gh-jmichalak 939f823
Fixes
sfc-gh-jmichalak 994bcd1
Fix tests
sfc-gh-jmichalak 40dde78
Fix tests, proper x509 handling
sfc-gh-jmichalak c881bd2
Improve tests
sfc-gh-jmichalak b8bc79f
Merge remote-tracking branch 'origin/main' into jmichalak-security-in…
sfc-gh-jmichalak 834dabd
Remove scim2 enabled
sfc-gh-jmichalak 19022af
Merge remote-tracking branch 'origin/main' into jmichalak-security-in…
sfc-gh-jmichalak f9c9d3c
Improve certs generation in tests
sfc-gh-jmichalak c5eede3
Fix tests
sfc-gh-jmichalak 77fdb8d
Restore account param
sfc-gh-jmichalak 9563d24
Merge remote-tracking branch 'origin/main' into jmichalak-security-in…
sfc-gh-jmichalak aa792e2
Fix
sfc-gh-jmichalak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package random | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "crypto/rand" | ||
| "crypto/rsa" | ||
| "crypto/x509" | ||
| "crypto/x509/pkix" | ||
| "encoding/pem" | ||
| "math/big" | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // Generate X509 returns base64 encoded certificate on a single line without the leading -----BEGIN CERTIFICATE----- and ending -----END CERTIFICATE----- markers. | ||
| func GenerateX509(t *testing.T) string { | ||
| t.Helper() | ||
| ca := &x509.Certificate{ | ||
| SerialNumber: big.NewInt(1658), | ||
| Subject: pkix.Name{ | ||
| Organization: []string{"Company, INC."}, | ||
| }, | ||
| NotAfter: time.Now().AddDate(10, 0, 0), | ||
| ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}, | ||
| KeyUsage: x509.KeyUsageDigitalSignature, | ||
| } | ||
|
|
||
| caPrivKey, err := rsa.GenerateKey(rand.Reader, 2048) | ||
| require.NoError(t, err) | ||
|
|
||
| caBytes, err := x509.CreateCertificate(rand.Reader, ca, ca, &caPrivKey.PublicKey, caPrivKey) | ||
| require.NoError(t, err) | ||
|
|
||
| certPEM := new(bytes.Buffer) | ||
| err = pem.Encode(certPEM, &pem.Block{ | ||
| Type: "CERTIFICATE", | ||
| Bytes: caBytes, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| cert := strings.TrimPrefix(certPEM.String(), "-----BEGIN CERTIFICATE-----\n") | ||
| cert = strings.TrimSuffix(cert, "-----END CERTIFICATE-----\n") | ||
| return cert | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package helpers | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random" | ||
| "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| type SecurityIntegrationClient struct { | ||
| context *TestClientContext | ||
| ids *IdsGenerator | ||
| } | ||
|
|
||
| func NewSecurityIntegrationClient(context *TestClientContext, idsGenerator *IdsGenerator) *SecurityIntegrationClient { | ||
| return &SecurityIntegrationClient{ | ||
| context: context, | ||
| ids: idsGenerator, | ||
| } | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) client() sdk.SecurityIntegrations { | ||
| return c.context.client.SecurityIntegrations | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) CreateSaml2(t *testing.T, id sdk.AccountObjectIdentifier) (*sdk.SecurityIntegration, func()) { | ||
| t.Helper() | ||
| return c.CreateSaml2WithRequest(t, sdk.NewCreateSaml2SecurityIntegrationRequest(id, false, c.ids.Alpha(), "https://example.com", "Custom", random.GenerateX509(t))) | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) CreateSaml2WithRequest(t *testing.T, request *sdk.CreateSaml2SecurityIntegrationRequest) (*sdk.SecurityIntegration, func()) { | ||
| t.Helper() | ||
| ctx := context.Background() | ||
|
|
||
| err := c.client().CreateSaml2(ctx, request) | ||
| require.NoError(t, err) | ||
|
|
||
| si, err := c.client().ShowByID(ctx, request.GetName()) | ||
| require.NoError(t, err) | ||
|
|
||
| return si, c.DropSecurityIntegrationFunc(t, request.GetName()) | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) CreateScim(t *testing.T) (*sdk.SecurityIntegration, func()) { | ||
| t.Helper() | ||
| return c.CreateScimWithRequest(t, sdk.NewCreateScimSecurityIntegrationRequest(c.ids.RandomAccountObjectIdentifier(), false, sdk.ScimSecurityIntegrationScimClientGeneric, sdk.ScimSecurityIntegrationRunAsRoleGenericScimProvisioner)) | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) CreateScimWithRequest(t *testing.T, request *sdk.CreateScimSecurityIntegrationRequest) (*sdk.SecurityIntegration, func()) { | ||
| t.Helper() | ||
| ctx := context.Background() | ||
|
|
||
| err := c.client().CreateScim(ctx, request) | ||
| require.NoError(t, err) | ||
|
|
||
| si, err := c.client().ShowByID(ctx, request.GetName()) | ||
| require.NoError(t, err) | ||
|
|
||
| return si, c.DropSecurityIntegrationFunc(t, request.GetName()) | ||
| } | ||
|
|
||
| func (c *SecurityIntegrationClient) DropSecurityIntegrationFunc(t *testing.T, id sdk.AccountObjectIdentifier) func() { | ||
| t.Helper() | ||
| ctx := context.Background() | ||
|
|
||
| return func() { | ||
| err := c.client().Drop(ctx, sdk.NewDropSecurityIntegrationRequest(id).WithIfExists(sdk.Bool(true))) | ||
| require.NoError(t, err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not add also others (there were three in the docs, right?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, I didn't need this atm, as the remaining roles are present in
defsfile. I can add them here in follow ups tho