more instance test fixes

Author: scotthart

google/cloud/bigtable/tests/instance_admin_integration_test.cc

@@ -129,8 +129,13 @@ TEST_F(InstanceAdminIntegrationTest, ListAllClustersTest) {
   auto config_2 = IntegrationTestConfig(
       id_2, zone_b_, bigtable::InstanceConfig::PRODUCTION, 3);
 
-  auto instance_1_fut = instance_admin_->CreateInstance(config_1.as_proto());
-  auto instance_2_fut = instance_admin_->CreateInstance(config_2.as_proto());
+  auto create_request_1 = config_1.as_proto();
+  create_request_1.set_parent(Project(project_id_).FullName());
+  auto create_request_2 = config_2.as_proto();
+  create_request_2.set_parent(Project(project_id_).FullName());
+
+  auto instance_1_fut = instance_admin_->CreateInstance(create_request_1);
+  auto instance_2_fut = instance_admin_->CreateInstance(create_request_2);
 
   // Wait for instance creation
   auto instance_1 = instance_1_fut.get();
@@ -254,7 +259,7 @@ TEST_F(InstanceAdminIntegrationTest, CreateListGetDeleteAppProfile) {
   EXPECT_THAT(*names, Not(Contains(name_1)));
   EXPECT_THAT(*names, Not(Contains(name_2)));
 
-  ASSERT_STATUS_OK(instance_admin_->DeleteInstance(instance_id));
+  ASSERT_STATUS_OK(instance_admin_->DeleteInstance(instance_name));
 }
 
 /// @test Verify that Instance CRUD operations work as expected.
@@ -284,7 +289,7 @@ TEST_F(InstanceAdminIntegrationTest, CreateListGetDeleteInstanceTest) {
   EXPECT_TRUE(IsInstancePresent(instances->instances(), instance->name()));
 
   // Get instance
-  instance = instance_admin_->GetInstance(instance_id);
+  instance = instance_admin_->GetInstance(instance_name);
   ASSERT_STATUS_OK(instance);
   EXPECT_EQ(instance->name(), instance_name);
 
@@ -407,7 +412,7 @@ TEST_F(InstanceAdminIntegrationTest, SetGetTestIamNativeAPIsTest) {
   ASSERT_STATUS_OK(permission_set);
 
   EXPECT_EQ(2, permission_set->permissions().size());
-  EXPECT_STATUS_OK(instance_admin_->DeleteInstance(instance_id));
+  EXPECT_STATUS_OK(instance_admin_->DeleteInstance(instance_name));
 }
 
 /// @test Verify that Instance CRUD operations with logging work as expected.
@@ -450,7 +455,7 @@ TEST_F(InstanceAdminIntegrationTest,
   EXPECT_TRUE(IsInstancePresent(instances->instances(), instance->name()));
 
   // Get instance
-  instance = instance_admin->GetInstance(instance_id);
+  instance = instance_admin->GetInstance(instance_name);
   ASSERT_STATUS_OK(instance);
   EXPECT_EQ(instance->name(), instance_name);
 
@@ -517,7 +522,7 @@ TEST_F(InstanceAdminIntegrationTest, CustomWorkers) {
   std::thread t([cq]() mutable { cq.Run(); });
   auto instance = instance_fut.get();
   ASSERT_STATUS_OK(instance);
-  EXPECT_STATUS_OK(instance_admin_->DeleteInstance(instance_id));
+  EXPECT_STATUS_OK(instance_admin_->DeleteInstance(InstanceName(project_id_, instance_id)));
 
   cq.CancelAll();
   cq.Shutdown();