Port over 162 and 165 to master (#176)

Co-authored-by: Jim Lambert <jlambert@hashicorp.com>
Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com>

internal/proto/local/controller/api/resources/roles/v1/role.proto

@@ -30,18 +30,25 @@ message Role {
 	// Whether the resource is disabled
 	google.protobuf.BoolValue disabled = 6;
 
+	// The scope the grants will apply to. If the role is at the global scope,
+	// this can be an organization or project. If the role is at an organization
+	// scope, this can be a project within the organization. It is invalid for
+	// this to be anything other than the role's scope when the role's scope is
+	// a project.
+	google.protobuf.StringValue grant_scope_id = 7 [json_name="grant_scope_id"];
+	
 	// The version can be used in subsiquent write requests to ensure this resource
 	// has not changed and to fail the write if it has.
 	// Output only.
-	uint32 version = 7;
+	uint32 version = 8;
 
 	// The principals that are assigned this role.
 	// Output only.
-	repeated string user_ids = 8;
+	repeated string user_ids = 9;
 	// Output only.
-	repeated string group_ids = 9;
+	repeated string group_ids = 10;
 
 	// The grants that this role provides for it's principals.
 	// Output only.
-	repeated string grants = 10;
+	repeated string grants = 11;
 }