Fixing Cassandra schema and Mongo shard key null values

Author: Meha Kaushik

src/CosmosDB/CosmosDB/CosmosDBAccount/NewAzCosmosDBAccount.cs

@@ -224,6 +224,7 @@ public override void ExecuteCmdlet()
                             databaseAccountCreateUpdateParameters.Capabilities = new List<Capability> { new Capability { Name = "EnableTable" } };
                             break;
                     }
+
                     ApiKind = null;
                 }
             }

src/CosmosDB/CosmosDB/Models/PSCassandraSchema.cs

@@ -25,6 +25,23 @@ public PSCassandraSchema()
 
         public PSCassandraSchema(CassandraSchema cassandraSchema)
         {
+            Columns = new List<PSColumn>();
+            foreach (Column column in cassandraSchema.Columns)
+            {
+                Columns.Add(new PSColumn(column));
+            }
+
+            PartitionKeys = new List<PSCassandraPartitionKey>();
+            foreach (CassandraPartitionKey cassandraPartitionKey in cassandraSchema.PartitionKeys)
+            {
+                PartitionKeys.Add(new PSCassandraPartitionKey(cassandraPartitionKey));
+            }
+
+            ClusterKeys = new List<PSClusterKey>();
+            foreach (ClusterKey clusterKey in cassandraSchema.ClusterKeys)
+            {
+                ClusterKeys.Add(new PSClusterKey(clusterKey));
+            }
         }
 
         //

src/CosmosDB/CosmosDB/Models/PSMongoDBCollectionGetPropertiesResource.cs

@@ -21,6 +21,11 @@ public class PSMongoDBCollectionGetPropertiesResource
     {
         public PSMongoDBCollectionGetPropertiesResource(MongoDBCollectionGetPropertiesResource mongoDBCollectionGetPropertiesResource)
         {
+            Id = mongoDBCollectionGetPropertiesResource.Id;
+            if (mongoDBCollectionGetPropertiesResource.ShardKey != null)
+            {
+                ShardKey = new Dictionary<string, string>(mongoDBCollectionGetPropertiesResource.ShardKey);
+            }
             List<PSMongoIndex> psMongoIndex = new List<PSMongoIndex>();
             if (mongoDBCollectionGetPropertiesResource.Indexes != null)
             {