chore: Add SecretManager service regional code samples

YashSaraf11 · YashSaraf11 · commit 5aa8fee9024a · 2025-02-12T10:15:35.000Z
diff --git a/secretmanager/api/SecretManager.Samples.Tests/AccessRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/AccessRegionalSecretVersionTests.cs
@@ -42,11 +42,8 @@ public void AccessRegionalSecretVersion()
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret was created with the correct value.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal("my super secret data", result);
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/AddRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/AddRegionalSecretVersionTests.cs
@@ -44,16 +44,8 @@ public void AddsRegionalSecretVersions()
           data: data
         );
 
-<<<<<<< HEAD
-        // Create the Regional Secret Manager Client.
-        SecretManagerServiceClient client = new SecretManagerServiceClientBuilder
-        {
-            Endpoint = $"secretmanager.{secretName.LocationId}.rep.googleapis.com"
-        }.Build();
-=======
         // Access the secret version.
         AccessSecretVersionResponse result = _fixture.client.AccessSecretVersion(secretVersion.SecretVersionName);
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Assert that the secret version was added with the correct data.
         Assert.Equal(data, result.Payload.Data.ToStringUtf8());
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DeleteRegionalSecretTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DeleteRegionalSecretTests.cs
@@ -32,26 +32,11 @@ public DeleteRegionalSecretTests(RegionalSecretManagerFixture fixture)
     [Fact]
     public void DeletesRegionalSecrets()
     {
-<<<<<<< HEAD
-        SecretName secretName = _fixture.SecretToDelete.SecretName;
-        sss_sample.DeleteRegionalSecret(
-          projectId: secretName.ProjectId,
-          locationId: secretName.LocationId,
-          secretId: secretName.SecretId
-        );
-
-        // Create the Regional Secret Manager Client.
-        SecretManagerServiceClient client = new SecretManagerServiceClientBuilder
-        {
-            Endpoint = $"secretmanager.{secretName.LocationId}.rep.googleapis.com"
-        }.Build();
-=======
         // Create the secret.
         Secret secret = _fixture.CreateSecret(_fixture.RandomId());
 
         // Get the secretName from the created secret.
         SecretName secretName = secret.SecretName;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Run the sample.
         _sample.DeleteRegionalSecret(
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DeleteRegionalSecretWithEtagTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DeleteRegionalSecretWithEtagTests.cs
@@ -35,31 +35,14 @@ public void DeletesRegionalSecretsWithEtag()
         // Create the secret.
         Secret secret = _fixture.CreateSecret(_fixture.RandomId());
 
-<<<<<<< HEAD
-        // Create the Regional Secret Manager Client.
-        SecretManagerServiceClient client = new SecretManagerServiceClientBuilder
-        {
-            Endpoint = $"secretmanager.{secretName.LocationId}.rep.googleapis.com"
-        }.Build();
-=======
         // Get the secret name.
         SecretName secretName = secret.SecretName;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Get the secret from the cloud.
         Secret secretFetched = _fixture.client.GetSecret(secretName);
 
-<<<<<<< HEAD
-        _sample.DeleteRegionalSecretWithEtag(
-          projectId: secretName.ProjectId,
-          locationId: secretName.LocationId,
-          secretId: secretName.SecretId,
-          etag: updatedEtag
-        );
-=======
         // Set the updated etag fetched.
         string updatedEtag = secretFetched.Etag;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Run the sample to delete the secret with etag.
         _sample.DeleteRegionalSecretWithEtag(
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DestroyRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DestroyRegionalSecretVersionTests.cs
@@ -44,11 +44,8 @@ public void DestroysRegionalSecretVersions()
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret version state is set to destroyed.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Destroyed, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DestroyRegionalSecretVersionWithEtagTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DestroyRegionalSecretVersionWithEtagTests.cs
@@ -48,11 +48,8 @@ public void DestroysRegionalSecretVersionsWithEtag()
           secretVersionId: secretVersionName.SecretVersionId,
           etag: etag
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret version state is set to destroyed.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Destroyed, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DisableRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DisableRegionalSecretVersionTests.cs
@@ -44,11 +44,8 @@ public void DisablesRegionalSecretVersions()
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret version is in disabled state.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Disabled, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/DisableRegionalSecretVersionWithEtagTests.cs b/secretmanager/api/SecretManager.Samples.Tests/DisableRegionalSecretVersionWithEtagTests.cs
@@ -37,35 +37,19 @@ public void DisablesRegionalSecretVersionsWithEtag()
         SecretVersion addSecretVersion = _fixture.AddSecretVersion(secret);
         SecretVersionName secretVersionName = addSecretVersion.SecretVersionName;
 
-<<<<<<< HEAD
-        // Create the Regional Secret Manager Client.
-        SecretManagerServiceClient client = new SecretManagerServiceClientBuilder
-        {
-            Endpoint = $"secretmanager.{secretName.LocationId}.rep.googleapis.com"
-        }.Build();
-
-        SecretVersion enabledSecretVersion = client.EnableSecretVersion(secretVersionName);
-        string updatedEtag = enabledSecretVersion.Etag;
-=======
         // Get the etag associated with secret version.
         string etag = addSecretVersion.Etag;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Run the code sample.
         SecretVersion secretVersion = _sample.DisableRegionalSecretVersionWithEtag(
           projectId: secretVersionName.ProjectId,
           locationId: secretVersionName.LocationId,
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId,
-<<<<<<< HEAD
-          etag: updatedEtag
-        );
-=======
           etag: etag
         );
 
         // Assert that the secret version is in disabled state.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Disabled, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/EnableRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/EnableRegionalSecretVersionTests.cs
@@ -44,11 +44,8 @@ public void EnablesRegionalSecretVersions()
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret version is in enabled state.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Enabled, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/EnableRegionalSecretVersionWithEtagTests.cs b/secretmanager/api/SecretManager.Samples.Tests/EnableRegionalSecretVersionWithEtagTests.cs
@@ -37,16 +37,8 @@ public void EnablesRegionalSecretVersionsWithEtag()
         SecretVersion addSecretVersion = _fixture.AddSecretVersion(secret);
         SecretVersionName secretVersionName = addSecretVersion.SecretVersionName;
 
-<<<<<<< HEAD
-        // Create the Regional Secret Manager Client.
-        SecretManagerServiceClient client = new SecretManagerServiceClientBuilder
-        {
-            Endpoint = $"secretmanager.{secretName.LocationId}.rep.googleapis.com"
-        }.Build();
-=======
         // Disable the secret version.
         SecretVersion disabledSecretVersion = _fixture.DisableSecretVersion(addSecretVersion);
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 
         // Get the updated etag associated with the secret version.
         string updatedEtag = disabledSecretVersion.Etag;
@@ -59,11 +51,8 @@ public void EnablesRegionalSecretVersionsWithEtag()
           secretVersionId: secretVersionName.SecretVersionId,
           etag: updatedEtag
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secret version is in enabled state.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(SecretVersion.Types.State.Enabled, secretVersion.State);
 
         // Clean the created resources.
diff --git a/secretmanager/api/SecretManager.Samples.Tests/GetRegionalSecretVersionTests.cs b/secretmanager/api/SecretManager.Samples.Tests/GetRegionalSecretVersionTests.cs
@@ -42,11 +42,8 @@ public void GetsRegionalSecretVersions()
           secretId: secretVersionName.SecretId,
           secretVersionId: secretVersionName.SecretVersionId
         );
-<<<<<<< HEAD
-=======
 
         // Assert that the secretversion id is equal to expected value.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         Assert.Equal(result.SecretVersionName.SecretVersionId, secretVersionName.SecretVersionId);
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretVersionsTests.cs b/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretVersionsTests.cs
@@ -15,12 +15,7 @@
  */
 
 using Google.Cloud.SecretManager.V1;
-<<<<<<< HEAD
-using System;
-using System.IO;
-=======
 using System.Collections.Generic;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 using Xunit;
 
 [Collection(nameof(RegionalSecretManagerFixture))]
@@ -38,33 +33,14 @@ public ListRegionalSecretVersionsTests(RegionalSecretManagerFixture fixture)
     [Fact]
     public void ListsRegionalSecretVersions()
     {
-<<<<<<< HEAD
-        // Redirect console output to a StringWriter
-        StringWriter stringWriter = new StringWriter();
-        Console.SetOut(stringWriter);
-
-=======
         // Get the secret name.
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
         SecretName secretName = _fixture.Secret.SecretName;
 
         // Run the code sample.
         List<SecretVersion> result = _sample.ListRegionalSecretVersions(
             projectId: secretName.ProjectId, locationId: secretName.LocationId, secretId: secretName.SecretId);
 
-<<<<<<< HEAD
-        // Get the console output and restore the original console output stream
-        string output = stringWriter.ToString();
-        Console.SetOut(new StreamWriter(Console.OpenStandardOutput()));
-
-        // Construct the expected regex pattern.
-        string pattern = $@"Got regional secret version : projects\/{secretName.ProjectId}\/locations\/{secretName.LocationId}\/secrets\/[\w-]+";
-
-        // Assert that the output matches the pattern.
-        Assert.Matches(pattern, output);
-=======
         // Assert that the secret list is not empty.
         Assert.NotEmpty(result);
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretVersionsWithFilterTests.cs b/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretVersionsWithFilterTests.cs
@@ -15,12 +15,7 @@
  */
 
 using Google.Cloud.SecretManager.V1;
-<<<<<<< HEAD
-using System;
-using System.IO;
-=======
 using System.Collections.Generic;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 using Xunit;
 
 [Collection(nameof(RegionalSecretManagerFixture))]
@@ -38,26 +33,6 @@ public ListRegionalSecretVersionsWithFilterTests(RegionalSecretManagerFixture fi
     [Fact]
     public void ListsRegionalSecretVersions()
     {
-<<<<<<< HEAD
-        // Redirect console output to a StringWriter
-        StringWriter stringWriter = new StringWriter();
-        Console.SetOut(stringWriter);
-
-        SecretName secretName = _fixture.Secret.SecretName;
-        string filter = "name:csharp";
-        _sample.ListRegionalSecretVersionsWithFilter(
-            projectId: secretName.ProjectId, locationId: secretName.LocationId, secretId: secretName.SecretId, filter: filter);
-
-        // Get the console output and restore the original console output stream
-        string output = stringWriter.ToString();
-        Console.SetOut(new StreamWriter(Console.OpenStandardOutput()));
-
-        // Construct the expected regex pattern.
-        string pattern = $@"Got regional secret version : projects\/{secretName.ProjectId}\/locations\/{secretName.LocationId}\/secrets\/[\w-]+";
-
-        // Assert that the output matches the pattern.
-        Assert.Matches(pattern, output);
-=======
         string filter = "name:csharp";
 
         // Get the secret name.
@@ -85,6 +60,5 @@ public void ListsRegionalSecretVersions_Empty()
 
         // Assert that the result is empty.
         Assert.Empty(result);
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretsTests.cs b/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretsTests.cs
@@ -15,12 +15,7 @@
  */
 
 using Google.Cloud.SecretManager.V1;
-<<<<<<< HEAD
-using System;
-using System.IO;
-=======
 using System.Collections.Generic;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 using Xunit;
 
 [Collection(nameof(RegionalSecretManagerFixture))]
@@ -38,24 +33,6 @@ public ListRegionalSecretsTests(RegionalSecretManagerFixture fixture)
     [Fact]
     public void ListsRegionalSecrets()
     {
-<<<<<<< HEAD
-        // Redirect console output to a StringWriter
-        StringWriter stringWriter = new StringWriter();
-        Console.SetOut(stringWriter);
-
-        SecretName secretName = _fixture.Secret.SecretName;
-        _sample.ListRegionalSecrets(projectId: secretName.ProjectId, locationId: secretName.LocationId);
-
-        // Get the console output and restore the original console output stream
-        string output = stringWriter.ToString();
-        Console.SetOut(new StreamWriter(Console.OpenStandardOutput()));
-
-        // Construct the expected regex pattern.
-        string pattern = $@"Got regional secret : projects\/{secretName.ProjectId}\/locations\/{secretName.LocationId}\/secrets\/[\w-]+";
-
-        // Assert that the output matches the pattern.
-        Assert.Matches(pattern, output);
-=======
         // Get the secret name.
         SecretName secretName = _fixture.Secret.SecretName;
 
@@ -65,6 +42,5 @@ public void ListsRegionalSecrets()
         // Assert that the fetched list is not empty.
         Assert.NotEmpty(result);
 
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretsWithFilterTests.cs b/secretmanager/api/SecretManager.Samples.Tests/ListRegionalSecretsWithFilterTests.cs
@@ -15,12 +15,7 @@
  */
 
 using Google.Cloud.SecretManager.V1;
-<<<<<<< HEAD
-using System;
-using System.IO;
-=======
 using System.Collections.Generic;
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
 using Xunit;
 
 [Collection(nameof(RegionalSecretManagerFixture))]
@@ -38,25 +33,6 @@ public ListRegionalSecretsWithFilterTests(RegionalSecretManagerFixture fixture)
     [Fact]
     public void ListsRegionalSecretsWithFilter()
     {
-<<<<<<< HEAD
-        // Redirect console output to a StringWriter
-        StringWriter stringWriter = new StringWriter();
-        Console.SetOut(stringWriter);
-
-        SecretName secretName = _fixture.Secret.SecretName;
-        string filter = "name:csharp";
-        _sample.ListRegionalSecretsWithFilter(projectId: secretName.ProjectId, locationId: secretName.LocationId, filter: filter);
-
-        // Get the console output and restore the original console output stream
-        string output = stringWriter.ToString();
-        Console.SetOut(new StreamWriter(Console.OpenStandardOutput()));
-
-        // Construct the expected regex pattern.
-        string pattern = $@"Got regional secret : projects\/{secretName.ProjectId}\/locations\/{secretName.LocationId}\/secrets\/[\w-]+";
-
-        // Assert that the output matches the pattern.
-        Assert.Matches(pattern, output);
-=======
         string filter = "name:csharp";
 
         // Get the secret name.
@@ -82,6 +58,5 @@ public void ListsRegionalSecretsWithFilter_Empty()
 
         // Assert that the result is empty.
         Assert.Empty(result);
->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)
     }
 }
diff --git a/secretmanager/api/SecretManager.Samples.Tests/RegionalSecretManagerFixture.cs b/secretmanager/api/SecretManager.Samples.Tests/RegionalSecretManagerFixture.cs
diff --git a/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretTests.cs b/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretTests.cs
diff --git a/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretWithAliasTests.cs b/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretWithAliasTests.cs
diff --git a/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretWithEtagTests.cs b/secretmanager/api/SecretManager.Samples.Tests/UpdateRegionalSecretWithEtagTests.cs

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,8 @@ public void AccessRegionalSecretVersion()`
`42`	`42`	`secretId: secretVersionName.SecretId,`
`43`	`43`	`secretVersionId: secretVersionName.SecretVersionId`
`44`	`44`	`);`
`45`		`-<<<<<<< HEAD`
`46`		`-=======`
`47`	`45`
`48`	`46`	`// Assert that the secret was created with the correct value.`
`49`		`->>>>>>> 95d07aff (chore: Add SecretManager service regional code samples)`
`50`	`47`	`Assert.Equal("my super secret data", result);`
`51`	`48`	`}`
`52`	`49`	`}`