Remove KeyHash from piped model

pkg/datastore/pipedstore_test.go

@@ -46,7 +46,6 @@ func TestAddPiped(t *testing.T) {
 			piped: &model.Piped{
 				Id:        "id",
 				Name:      "name",
-				KeyHash:   "key-hash",
 				ProjectId: "project-id",
 				CreatedAt: 1,
 				UpdatedAt: 1,

pkg/model/piped.go

@@ -58,15 +58,6 @@ func GeneratePipedKey() (key, hash string, err error) {
 
 // CheckKey checks if the give key is one of the stored keys.
 func (p *Piped) CheckKey(key string) (err error) {
-	// The KeyHash field was deprecated.
-	// And this block will be removed in the future.
-	if p.KeyHash != "" {
-		err = bcrypt.CompareHashAndPassword([]byte(p.KeyHash), []byte(key))
-		if err == nil {
-			return nil
-		}
-	}
-
 	if len(p.Keys) == 0 {
 		return errors.New("piped does not contain any key")
 	}
@@ -104,9 +95,6 @@ func (p *Piped) AddKey(hash, creator string, createdAt time.Time) error {
 
 // DeleteOldPipedKeys removes all old keys to keep only the latest one.
 func (p *Piped) DeleteOldPipedKeys() {
-	// This field was deprecated so we reset it too.
-	p.KeyHash = ""
-
 	if len(p.Keys) < 2 {
 		return
 	}
@@ -121,7 +109,6 @@ func (p *Piped) DeleteOldPipedKeys() {
 }
 
 func (p *Piped) RedactSensitiveData() {
-	p.KeyHash = redactedMessage
 	for i := range p.Keys {
 		p.Keys[i].Hash = redactedMessage
 	}

pkg/model/piped.proto

@@ -21,7 +21,7 @@ import "validate/validate.proto";
 import "pkg/model/common.proto";
 
 message Piped {
-    reserved 6;
+    reserved 4, 6;
 
     message CloudProvider {
         string name = 1 [(validate.rules).string.min_len = 1];
@@ -46,9 +46,6 @@ message Piped {
     string name = 2 [(validate.rules).string.min_len = 1];
     // The additional description about the piped.
     string desc = 3;
-    // The hash value of the secret key generated for the piped.
-    // This is used to authenticate while communicating with the control plane.
-    string key_hash = 4 [deprecated=true];
     // The ID of the project this piped belongs to.
     string project_id = 5 [(validate.rules).string.min_len = 1];
 

pkg/model/piped_test.go

@@ -104,18 +104,15 @@ func TestPipedDeleteOldPipedKeys(t *testing.T) {
 		{
 			name: "no key",
 			piped: Piped{
-				KeyHash: "hash-key",
-				Keys:    []*PipedKey{},
+				Keys: []*PipedKey{},
 			},
 			expected: Piped{
-				KeyHash: "",
-				Keys:    []*PipedKey{},
+				Keys: []*PipedKey{},
 			},
 		},
 		{
 			name: "has 1 key",
 			piped: Piped{
-				KeyHash: "hash-key",
 				Keys: []*PipedKey{
 					{
 						Hash:      "hash-1",
@@ -125,7 +122,6 @@ func TestPipedDeleteOldPipedKeys(t *testing.T) {
 				},
 			},
 			expected: Piped{
-				KeyHash: "",
 				Keys: []*PipedKey{
 					{
 						Hash:      "hash-1",
@@ -138,7 +134,6 @@ func TestPipedDeleteOldPipedKeys(t *testing.T) {
 		{
 			name: "has multiple keys",
 			piped: Piped{
-				KeyHash: "hash-key",
 				Keys: []*PipedKey{
 					{
 						Hash:      "hash-1",
@@ -158,7 +153,6 @@ func TestPipedDeleteOldPipedKeys(t *testing.T) {
 				},
 			},
 			expected: Piped{
-				KeyHash: "",
 				Keys: []*PipedKey{
 					{
 						Hash:      "hash-3",
@@ -185,9 +179,8 @@ func TestPipedRedactSensitiveData(t *testing.T) {
 		expected Piped
 	}{
 		{
-			name: "contains both KeyHash and Keys",
+			name: "contains multiple Keys",
 			piped: Piped{
-				KeyHash: "hash-key",
 				Keys: []*PipedKey{
 					{
 						Hash:      "hash-1",
@@ -207,7 +200,6 @@ func TestPipedRedactSensitiveData(t *testing.T) {
 				},
 			},
 			expected: Piped{
-				KeyHash: "redacted",
 				Keys: []*PipedKey{
 					{
 						Hash:      "redacted",

web/model/piped_pb.d.ts

@@ -14,9 +14,6 @@ export class Piped extends jspb.Message {
   getDesc(): string;
   setDesc(value: string): Piped;
 
-  getKeyHash(): string;
-  setKeyHash(value: string): Piped;
-
   getProjectId(): string;
   setProjectId(value: string): Piped;
 
@@ -77,7 +74,6 @@ export namespace Piped {
     id: string,
     name: string,
     desc: string,
-    keyHash: string,
     projectId: string,
     version: string,
     startedAt: number,