Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(pubsub): fix failing message storage policy tests #4003

Merged
merged 2 commits into from Apr 23, 2021
Merged

fix(pubsub): fix failing message storage policy tests #4003

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0683b34
fix(pubsub): fix failing message storage policy tests
hongalex Apr 23, 2021
179e46a
Merge branch 'master' into pubsub-msp
hongalex Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 2 additions & 32 deletions pubsub/integration_test.go
View file
Open in desktop
Expand Up @@ -774,22 +774,13 @@ func TestIntegration_UpdateSubscription_ExpirationPolicy(t *testing.T) {
// NOTE: This test should be skipped by open source contributors. It requires
// allowlisting, a (gsuite) organization project, and specific permissions.
func TestIntegration_UpdateTopicLabels(t *testing.T) {
t.Skip("Skipping due to org level policy failing. https://github.com/googleapis/google-cloud-go/issues/3065")
t.Parallel()
ctx := context.Background()
client := integrationTestClient(ctx, t)
defer client.Close()

compareConfig := func(got TopicConfig, wantLabels map[string]string) bool {
if !testutil.Equal(got.Labels, wantLabels) {
return false
}
// For MessageStoragePolicy, we don't want to check for an exact set of regions.
// That set may change at any time. Instead, just make sure that the set isn't empty.
if len(got.MessageStoragePolicy.AllowedPersistenceRegions) == 0 {
return false
}
return true
return testutil.Equal(got.Labels, wantLabels)
}

topic, err := client.CreateTopic(ctx, topicIDs.New())
Expand Down Expand Up @@ -903,7 +894,6 @@ func TestIntegration_Errors(t *testing.T) {
}

func TestIntegration_MessageStoragePolicy_TopicLevel(t *testing.T) {
t.Skip("Skipping due to org level policy failing. https://github.com/googleapis/google-cloud-go/issues/3065")
t.Parallel()
ctx := context.Background()
client := integrationTestClient(ctx, t)
Expand All @@ -916,18 +906,9 @@ func TestIntegration_MessageStoragePolicy_TopicLevel(t *testing.T) {
defer topic.Delete(ctx)
defer topic.Stop()

// Initially the message storage policy should just be non-empty
got, err := topic.Config(ctx)
if err != nil {
t.Fatal(err)
}
if len(got.MessageStoragePolicy.AllowedPersistenceRegions) == 0 {
t.Fatalf("Empty AllowedPersistenceRegions in :\n%+v", got)
}

// Specify some regions to set.
regions := []string{"asia-east1", "us-east1"}
got, err = topic.Update(ctx, TopicConfigToUpdate{
got, err := topic.Update(ctx, TopicConfigToUpdate{
MessageStoragePolicy: &MessageStoragePolicy{
AllowedPersistenceRegions: regions,
},
Expand All @@ -944,17 +925,6 @@ func TestIntegration_MessageStoragePolicy_TopicLevel(t *testing.T) {
t.Fatalf("\ngot %+v\nwant regions%+v", got, want)
}

// Reset all allowed regions to project default.
got, err = topic.Update(ctx, TopicConfigToUpdate{
MessageStoragePolicy: &MessageStoragePolicy{},
})
if err != nil {
t.Fatal(err)
}
if len(got.MessageStoragePolicy.AllowedPersistenceRegions) == 0 {
t.Fatalf("Unexpectedly got empty MessageStoragePolicy.AllowedPersistenceRegions in:\n%+v", got)
}

// Removing all regions should fail
updateCfg := TopicConfigToUpdate{
MessageStoragePolicy: &MessageStoragePolicy{
Expand Down