fix(parametermanager): update files & methods name and testcases

Author: vatsal-vora-crestdata

parametermanager/api/ParameterManager.Samples.Tests/DeleteParamTests.cs parametermanager/api/ParameterManager.Samples.Tests/DeleteParameterTests.cs

@@ -17,22 +17,22 @@
 using Google.Cloud.ParameterManager.V1;
 
 [Collection(nameof(ParameterManagerFixture))]
-public class DeleteParamTests
+public class DeleteParameterTests
 {
     private readonly ParameterManagerFixture _fixture;
-    private readonly DeleteParamSample _sample;
+    private readonly DeleteParameterSample _sample;
 
-    public DeleteParamTests(ParameterManagerFixture fixture)
+    public DeleteParameterTests(ParameterManagerFixture fixture)
     {
         _fixture = fixture;
-        _sample = new DeleteParamSample();
+        _sample = new DeleteParameterSample();
     }
 
     [Fact]
-    public void DeleteParam()
+    public void DeleteParameter()
     {
         ParameterName parameterName = _fixture.ParameterNameToDelete;
-        _sample.DeleteParam(projectId: parameterName.ProjectId, parameterId: parameterName.ParameterId);
+        _sample.DeleteParameter(projectId: parameterName.ProjectId, parameterId: parameterName.ParameterId);
 
         ParameterManagerClient client = ParameterManagerClient.Create();
         Assert.Throws<Grpc.Core.RpcException>(() => client.GetParameter(parameterName));

parametermanager/api/ParameterManager.Samples.Tests/DeleteParamVersionTests.cs parametermanager/api/ParameterManager.Samples.Tests/DeleteParameterVersionTests.cs

@@ -17,22 +17,22 @@
 using Google.Cloud.ParameterManager.V1;
 
 [Collection(nameof(ParameterManagerFixture))]
-public class DeleteParamVersionTests
+public class DeleteParameterVersionTests
 {
     private readonly ParameterManagerFixture _fixture;
-    private readonly DeleteParamVersionSample _sample;
+    private readonly DeleteParameterVersionSample _sample;
 
-    public DeleteParamVersionTests(ParameterManagerFixture fixture)
+    public DeleteParameterVersionTests(ParameterManagerFixture fixture)
     {
         _fixture = fixture;
-        _sample = new DeleteParamVersionSample();
+        _sample = new DeleteParameterVersionSample();
     }
 
     [Fact]
-    public void DeleteParamVersion()
+    public void DeleteParameterVersion()
     {
         ParameterVersionName parameterVersionName = _fixture.ParameterVersionNameToDelete;
-        _sample.DeleteParamVersion(projectId: parameterVersionName.ProjectId, parameterId: parameterVersionName.ParameterId, versionId: parameterVersionName.ParameterVersionId);
+        _sample.DeleteParameterVersion(projectId: parameterVersionName.ProjectId, parameterId: parameterVersionName.ParameterId, versionId: parameterVersionName.ParameterVersionId);
 
         ParameterManagerClient client = ParameterManagerClient.Create();
         Assert.Throws<Grpc.Core.RpcException>(() => client.GetParameterVersion(parameterVersionName));

parametermanager/api/ParameterManager.Samples.Tests/DisableParamVersionTests.cs parametermanager/api/ParameterManager.Samples.Tests/DisableParameterVersionTests.cs

@@ -17,24 +17,24 @@
 using Google.Cloud.ParameterManager.V1;
 
 [Collection(nameof(ParameterManagerFixture))]
-public class DisableParamVersionTests
+public class DisableParameterVersionTests
 {
     private readonly ParameterManagerFixture _fixture;
-    private readonly DisableParamVersionSample _sample;
+    private readonly DisableParameterVersionSample _sample;
 
-    public DisableParamVersionTests(ParameterManagerFixture fixture)
+    public DisableParameterVersionTests(ParameterManagerFixture fixture)
     {
         _fixture = fixture;
-        _sample = new DisableParamVersionSample();
+        _sample = new DisableParameterVersionSample();
     }
 
     [Fact]
-    public void DisableParamVersion()
+    public void DisableParameterVersion()
     {
-        ParameterVersion result = _sample.DisableParamVersion(projectId: _fixture.ProjectId, parameterId: _fixture.ParameterId, versionId: _fixture.ParameterVersionId);
+        ParameterVersion result = _sample.DisableParameterVersion(projectId: _fixture.ProjectId, parameterId: _fixture.ParameterId, versionId: _fixture.ParameterVersionId);
 
         Assert.NotNull(result);
-        Assert.Equal(result.Name, _fixture.ParameterVersionToRender.Name);
+        Assert.Equal(result.Name, _fixture.ParameterVersionToDisableAndEnable.Name);
         Assert.True(result.Disabled);
     }
 }

parametermanager/api/ParameterManager.Samples.Tests/EnableParamVersionTests.cs parametermanager/api/ParameterManager.Samples.Tests/EnableParameterVersionTests.cs

@@ -17,24 +17,24 @@
 using Google.Cloud.ParameterManager.V1;
 
 [Collection(nameof(ParameterManagerFixture))]
-public class EnableParamVersionTests
+public class EnableParameterVersionTests
 {
     private readonly ParameterManagerFixture _fixture;
-    private readonly EnableParamVersionSample _sample;
+    private readonly EnableParameterVersionSample _sample;
 
-    public EnableParamVersionTests(ParameterManagerFixture fixture)
+    public EnableParameterVersionTests(ParameterManagerFixture fixture)
     {
         _fixture = fixture;
-        _sample = new EnableParamVersionSample();
+        _sample = new EnableParameterVersionSample();
     }
 
     [Fact]
-    public void EnableParamVersion()
+    public void EnableParameterVersion()
     {
-        ParameterVersion result = _sample.EnableParamVersion(projectId: _fixture.ProjectId, parameterId: _fixture.ParameterId, versionId: _fixture.ParameterVersionId);
+        ParameterVersion result = _sample.EnableParameterVersion(projectId: _fixture.ProjectId, parameterId: _fixture.ParameterId, versionId: _fixture.ParameterVersionId);
 
         Assert.NotNull(result);
-        Assert.Equal(result.Name, _fixture.ParameterVersionToRender.Name);
+        Assert.Equal(result.Name, _fixture.ParameterVersionToDisableAndEnable.Name);
         Assert.False(result.Disabled);
     }
 }

parametermanager/api/ParameterManager.Samples.Tests/ParameterManagerFixture.cs

@@ -24,42 +24,20 @@ public class ParameterManagerFixture : IDisposable, ICollectionFixture<Parameter
 {
     public string ProjectId { get; }
     public string LocationId = "global";
-
     public string Payload = "test123";
-    public string JsonPayload = "{\"username\": \"test-user\", \"host\": \"localhost\"}";
-    public string SecretReference { get; }
-    public string SecretId = "projects/project-id/secrets/secret-id/versions/latest";
-
-    public ParameterName ParameterName { get; }
-    public ParameterName ParameterNameWithFormat { get; }
 
     public string ParameterId { get; }
-    public Parameter Parameter { get; }
-    public ParameterVersionName ParameterVersionName { get; }
-
-    public Parameter ParameterWithFormat { get; }
-    public ParameterVersionName ParameterVersionNameWithFormat { get; }
-
-    public Parameter ParameterWithSecretReference { get; }
-    public ParameterVersionName ParameterVersionNameWithSecretReference { get; }
+    public string ParameterVersionId { get; }
 
     public Parameter ParameterToDelete { get; }
     public ParameterName ParameterNameToDelete { get; }
 
-    public string ParameterVersionId { get; }
     public Parameter ParameterToDeleteVersion { get; }
     public ParameterVersion ParameterVersionToDelete { get; }
     public ParameterVersionName ParameterVersionNameToDelete { get; }
 
-    public ParameterName ParameterNameForQuickstart { get; }
-    public ParameterVersionName ParameterVersionNameForQuickstart { get; }
-
-    public Parameter ParameterToRender { get; }
-    public ParameterVersion ParameterVersionToRender { get; }
-    public ParameterVersionName ParameterVersionNameToRender { get; }
-    public Secret Secret { get; }
-    public SecretVersion SecretVersion { get; }
-    public Policy Policy { get; }
+    public ParameterVersion ParameterVersionToDisableAndEnable { get; }
+    public ParameterVersionName ParameterVersionNameToDisableAndEnable { get; }
     public ParameterManagerFixture()
     {
         ProjectId = Environment.GetEnvironmentVariable("GOOGLE_PROJECT_ID");
@@ -68,21 +46,6 @@ public ParameterManagerFixture()
             throw new Exception("missing GOOGLE_PROJECT_ID");
         }
 
-        ParameterName = new ParameterName(ProjectId, LocationId, RandomId());
-        ParameterNameWithFormat = new ParameterName(ProjectId, LocationId, RandomId());
-
-        ParameterId = RandomId();
-        Parameter = CreateParameter(ParameterId, ParameterFormat.Unformatted);
-        ParameterVersionName = new ParameterVersionName(ProjectId, LocationId, ParameterId, RandomId());
-
-        ParameterId = RandomId();
-        ParameterWithFormat = CreateParameter(ParameterId, ParameterFormat.Json);
-        ParameterVersionNameWithFormat = new ParameterVersionName(ProjectId, LocationId, ParameterId, RandomId());
-
-        ParameterId = RandomId();
-        ParameterWithSecretReference = CreateParameter(ParameterId, ParameterFormat.Unformatted);
-        ParameterVersionNameWithSecretReference = new ParameterVersionName(ProjectId, LocationId, ParameterId, RandomId());
-
         ParameterId = RandomId();
         ParameterToDelete = CreateParameter(ParameterId, ParameterFormat.Unformatted);
         ParameterNameToDelete = new ParameterName(ProjectId, LocationId, ParameterId);
@@ -93,40 +56,17 @@ public ParameterManagerFixture()
         ParameterVersionToDelete = CreateParameterVersion(ParameterId, ParameterVersionId, Payload);
         ParameterVersionNameToDelete = new ParameterVersionName(ProjectId, LocationId, ParameterId, ParameterVersionId);
 
-        ParameterId = RandomId();
-        ParameterVersionId = RandomId();
-        ParameterNameForQuickstart = new ParameterName(ProjectId, LocationId, ParameterId);
-        ParameterVersionNameForQuickstart = new ParameterVersionName(ProjectId, LocationId, ParameterId, ParameterVersionId);
-
-        ParameterId = RandomId();
         ParameterVersionId = RandomId();
-        ParameterToRender = CreateParameter(ParameterId, ParameterFormat.Json);
-        Secret = CreateSecret(RandomId());
-        SecretVersion = AddSecretVersion(Secret);
-        SecretReference = $"{{\"username\": \"test-user\", \"password\": \"__REF__(//secretmanager.googleapis.com/{Secret.SecretName}/versions/latest)\"}}";
-        ParameterVersionToRender = CreateParameterVersion(ParameterId, ParameterVersionId, SecretReference);
-        Policy = GrantIAMAccess(Secret.SecretName, ParameterToRender.PolicyMember.IamPolicyUidPrincipal.ToString());
-        ParameterVersionNameToRender = new ParameterVersionName(ProjectId, LocationId, ParameterId, ParameterVersionId);
+        ParameterVersionToDisableAndEnable = CreateParameterVersion(ParameterId, ParameterVersionId, Payload);
+        ParameterVersionNameToDisableAndEnable = new ParameterVersionName(ProjectId, LocationId, ParameterId, ParameterVersionId);
     }
 
     public void Dispose()
     {
-        DeleteParameter(ParameterName);
-        DeleteParameter(ParameterNameWithFormat);
-        DeleteParameterVersion(ParameterVersionName);
-        DeleteParameter(Parameter.ParameterName);
-        DeleteParameterVersion(ParameterVersionNameWithFormat);
-        DeleteParameter(ParameterWithFormat.ParameterName);
-        DeleteParameterVersion(ParameterVersionNameWithSecretReference);
-        DeleteParameter(ParameterWithSecretReference.ParameterName);
         DeleteParameter(ParameterNameToDelete);
         DeleteParameterVersion(ParameterVersionNameToDelete);
+        DeleteParameterVersion(ParameterVersionNameToDisableAndEnable);
         DeleteParameter(ParameterToDeleteVersion.ParameterName);
-        DeleteParameterVersion(ParameterVersionNameForQuickstart);
-        DeleteParameter(ParameterNameForQuickstart);
-        DeleteParameterVersion(ParameterVersionNameToRender);
-        DeleteParameter(ParameterToRender.ParameterName);
-        DeleteSecret(Secret.SecretName);
     }
 
     public String RandomId()
@@ -160,7 +100,7 @@ public ParameterVersion CreateParameterVersion(string parameterId, string versio
             }
         };
 
-        return client.CreateParameterVersion(parameterName.ToString(), parameterVersion, versionId);
+        return client.CreateParameterVersion(parameterName, parameterVersion, versionId);
     }
 
     private void DeleteParameter(ParameterName name)
@@ -188,68 +128,4 @@ private void DeleteParameterVersion(ParameterVersionName name)
             // Ignore error - Parameter version was already deleted
         }
     }
-
-    public Secret CreateSecret(string secretId)
-    {
-        SecretManagerServiceClient client = SecretManagerServiceClient.Create();
-        ProjectName projectName = new ProjectName(ProjectId);
-
-        Secret secret = new Secret
-        {
-            Replication = new Replication
-            {
-                Automatic = new Replication.Types.Automatic(),
-            },
-        };
-
-        return client.CreateSecret(projectName, secretId, secret);
-    }
-
-    public Policy GrantIAMAccess(SecretName secretName, string member)
-    {
-        // Create the client.
-        SecretManagerServiceClient client = SecretManagerServiceClient.Create();
-
-        // Get current policy.
-        Policy policy = client.GetIamPolicy(new GetIamPolicyRequest
-        {
-            ResourceAsResourceName = secretName,
-        });
-
-        // Add the user to the list of bindings.
-        policy.AddRoleMember("roles/secretmanager.secretAccessor", member);
-
-        // Save the updated policy.
-        policy = client.SetIamPolicy(new SetIamPolicyRequest
-        {
-            ResourceAsResourceName = secretName,
-            Policy = policy,
-        });
-        return policy;
-    }
-    private SecretVersion AddSecretVersion(Secret secret)
-    {
-        SecretManagerServiceClient client = SecretManagerServiceClient.Create();
-
-        SecretPayload payload = new SecretPayload
-        {
-            Data = ByteString.CopyFrom("my super secret data", Encoding.UTF8),
-        };
-
-        return client.AddSecretVersion(secret.SecretName, payload);
-    }
-
-    private void DeleteSecret(SecretName name)
-    {
-        SecretManagerServiceClient client = SecretManagerServiceClient.Create();
-
-        try
-        {
-            client.DeleteSecret(name);
-        }
-        catch (Grpc.Core.RpcException e) when (e.StatusCode == Grpc.Core.StatusCode.NotFound)
-        {
-            // Ignore error - secret was already deleted
-        }
-    }
 }

parametermanager/api/ParameterManager.Samples/DeleteParam.cs parametermanager/api/ParameterManager.Samples/DeleteParameter.cs

@@ -18,14 +18,14 @@
 
 using Google.Cloud.ParameterManager.V1;
 
-/// <summary>
-/// This function deletes a parameter using the Parameter Manager SDK for GCP.
-/// </summary>
-/// <param name="projectId">The ID of the project where the parameter is located.</param>
-/// <param name="parameterId">The ID of the parameter to be deleted.</param>
-public class DeleteParamSample
+public class DeleteParameterSample
 {
-    public void DeleteParam(
+    /// <summary>
+    /// This function deletes a parameter using the Parameter Manager SDK for GCP.
+    /// </summary>
+    /// <param name="projectId">The ID of the project where the parameter is located.</param>
+    /// <param name="parameterId">The ID of the parameter to be deleted.</param>
+    public void DeleteParameter(
         string projectId,
         string parameterId)
     {

parametermanager/api/ParameterManager.Samples/DeleteParamVersion.cs parametermanager/api/ParameterManager.Samples/DeleteParameterVersion.cs

@@ -18,15 +18,15 @@
 
 using Google.Cloud.ParameterManager.V1;
 
-/// <summary>
-/// This function deletes a parameter version using the Parameter Manager SDK for GCP.
-/// </summary>
-/// <param name="projectId">The ID of the project where the parameter is located.</param>
-/// <param name="parameterId">The ID of the parameter for which the version is to be deleted.</param>
-/// <param name="versionId">The ID of the version to be deleted.</param>
-public class DeleteParamVersionSample
+public class DeleteParameterVersionSample
 {
-    public void DeleteParamVersion(
+    /// <summary>
+    /// This function deletes a parameter version using the Parameter Manager SDK for GCP.
+    /// </summary>
+    /// <param name="projectId">The ID of the project where the parameter is located.</param>
+    /// <param name="parameterId">The ID of the parameter for which the version is to be deleted.</param>
+    /// <param name="versionId">The ID of the version to be deleted.</param>
+    public void DeleteParameterVersion(
         string projectId,
         string parameterId,
         string versionId)

parametermanager/api/ParameterManager.Samples/DisableParamVersion.cs parametermanager/api/ParameterManager.Samples/DisableParameterVersion.cs

@@ -19,16 +19,16 @@
 using Google.Cloud.ParameterManager.V1;
 using Google.Protobuf.WellKnownTypes;
 
-/// <summary>
-/// This function disables a parameter version using the Parameter Manager SDK for GCP.
-/// </summary>
-/// <param name="projectId">The ID of the project where the parameter is located.</param>
-/// <param name="parameterId">The ID of the parameter for which the version is to be disabled.</param>
-/// <param name="versionId">The ID of the version to be disabled.</param>
-/// <returns>The updated ParameterVersion object.</returns>
-public class DisableParamVersionSample
+public class DisableParameterVersionSample
 {
-    public ParameterVersion DisableParamVersion(
+    /// <summary>
+    /// This function disables a parameter version using the Parameter Manager SDK for GCP.
+    /// </summary>
+    /// <param name="projectId">The ID of the project where the parameter is located.</param>
+    /// <param name="parameterId">The ID of the parameter for which the version is to be disabled.</param>
+    /// <param name="versionId">The ID of the version to be disabled.</param>
+    /// <returns>The updated ParameterVersion object.</returns>
+    public ParameterVersion DisableParameterVersion(
         string projectId,
         string parameterId,
         string versionId)
@@ -43,7 +43,7 @@ public ParameterVersion DisableParamVersion(
         {
             ParameterVersion = new ParameterVersion
             {
-                Name = parameterVersionName.ToString(),
+                Name = parameterVersionName,
                 Disabled = true
             },
             UpdateMask = new FieldMask