Merge pull request #69 from k1LoW/re-fix-relation-id

[BREAKING] The value of the type or label should not be used to generate the Relation id.
k1LoW · Feb 8, 2021 · 3ea4f5a · 3ea4f5a
2 parents b3fda01 + 4159e99
commit 3ea4f5a
Show file tree

Hide file tree

Showing 48 changed files with 12 additions and 22 deletions.
diff --git a/config/relation.go b/config/relation.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"sort"
 	"strings"
 
 	"github.com/elliotchance/orderedmap"
@@ -95,16 +94,9 @@ func (rel *rawRelation) Id() string {
 	}
 	h := sha256.New()
 	seed := []string{}
-	seed = append(seed, rel.Type.Name)
 	for _, c := range rel.Components {
 		seed = append(seed, queryTrim(c))
 	}
-	sort.Slice(rel.Labels, func(i, j int) bool {
-		return rel.Labels[i] < rel.Labels[j]
-	})
-	for _, l := range rel.Labels {
-		seed = append(seed, l)
-	}
 	key := strings.ToLower(strings.Join(seed, "-"))
 	if _, err := io.WriteString(h, string(key)); err != nil {
 		return ""

diff --git a/..._files_ndiag.descriptions__.md-f7a140d.md → ..._files_ndiag.descriptions__.md-1cdb9dd.md b/..._files_ndiag.descriptions__.md-f7a140d.md → ..._files_ndiag.descriptions__.md-1cdb9dd.md
diff --git a/...relation-input_files_ndiag.yml-7034b8f.md → ...relation-input_files_ndiag.yml-da3a497.md b/...relation-input_files_ndiag.yml-7034b8f.md → ...relation-input_files_ndiag.yml-da3a497.md
diff --git a/...relation-input_files_nodes.yml-e3329fd.md → ...relation-input_files_nodes.yml-efaf14b.md b/...relation-input_files_nodes.yml-e3329fd.md → ...relation-input_files_nodes.yml-efaf14b.md
diff --git a/...ns.ja/_relation-ndiag_internal-002adea.md → ...ns.ja/_relation-ndiag_internal-5df3e05.md b/...ns.ja/_relation-ndiag_internal-002adea.md → ...ns.ja/_relation-ndiag_internal-5df3e05.md
diff --git a/...ns.ja/_relation-ndiag_internal-4890c43.md → ...ns.ja/_relation-ndiag_internal-8143d95.md b/...ns.ja/_relation-ndiag_internal-4890c43.md → ...ns.ja/_relation-ndiag_internal-8143d95.md
diff --git a/...ns.ja/_relation-ndiag_internal-700167e.md → ...ns.ja/_relation-ndiag_internal-9d28271.md b/...ns.ja/_relation-ndiag_internal-700167e.md → ...ns.ja/_relation-ndiag_internal-9d28271.md
diff --git a/...ns.ja/_relation-ndiag_internal-9a070bc.md → ...ns.ja/_relation-ndiag_internal-ee6a0d2.md b/...ns.ja/_relation-ndiag_internal-9a070bc.md → ...ns.ja/_relation-ndiag_internal-ee6a0d2.md
diff --git a/...ns.ja/_relation-ndiag_internal-b11e95d.md → ...ns.ja/_relation-ndiag_internal-eece4dd.md b/...ns.ja/_relation-ndiag_internal-b11e95d.md → ...ns.ja/_relation-ndiag_internal-eece4dd.md
diff --git a/..._files_ndiag.descriptions__.md-f7a140d.md → ..._files_ndiag.descriptions__.md-1cdb9dd.md b/..._files_ndiag.descriptions__.md-f7a140d.md → ..._files_ndiag.descriptions__.md-1cdb9dd.md
diff --git a/...relation-input_files_ndiag.yml-7034b8f.md → ...relation-input_files_ndiag.yml-da3a497.md b/...relation-input_files_ndiag.yml-7034b8f.md → ...relation-input_files_ndiag.yml-da3a497.md
diff --git a/...relation-input_files_nodes.yml-e3329fd.md → ...relation-input_files_nodes.yml-efaf14b.md b/...relation-input_files_nodes.yml-e3329fd.md → ...relation-input_files_nodes.yml-efaf14b.md
diff --git a/...tions/_relation-ndiag_internal-002adea.md → ...tions/_relation-ndiag_internal-5df3e05.md b/...tions/_relation-ndiag_internal-002adea.md → ...tions/_relation-ndiag_internal-5df3e05.md
diff --git a/...tions/_relation-ndiag_internal-4890c43.md → ...tions/_relation-ndiag_internal-8143d95.md b/...tions/_relation-ndiag_internal-4890c43.md → ...tions/_relation-ndiag_internal-8143d95.md
diff --git a/...tions/_relation-ndiag_internal-700167e.md → ...tions/_relation-ndiag_internal-9d28271.md b/...tions/_relation-ndiag_internal-700167e.md → ...tions/_relation-ndiag_internal-9d28271.md
diff --git a/...tions/_relation-ndiag_internal-9a070bc.md → ...tions/_relation-ndiag_internal-ee6a0d2.md b/...tions/_relation-ndiag_internal-9a070bc.md → ...tions/_relation-ndiag_internal-ee6a0d2.md
diff --git a/...tions/_relation-ndiag_internal-b11e95d.md → ...tions/_relation-ndiag_internal-eece4dd.md b/...tions/_relation-ndiag_internal-b11e95d.md → ...tions/_relation-ndiag_internal-eece4dd.md
diff --git a/...ptions/_relation-app_rails_app-5315b66.md → ...ptions/_relation-app_rails_app-7e41335.md b/...ptions/_relation-app_rails_app-5315b66.md → ...ptions/_relation-app_rails_app-7e41335.md
diff --git a/...ptions/_relation-lb_keepalived-462761b.md → ...escriptions/_relation-internet-4046636.md b/...ptions/_relation-lb_keepalived-462761b.md → ...escriptions/_relation-internet-4046636.md
diff --git a/...escriptions/_relation-lb_nginx-d49ef52.md → ...ptions/_relation-lb_keepalived-afc5653.md b/...escriptions/_relation-lb_nginx-d49ef52.md → ...ptions/_relation-lb_keepalived-afc5653.md
diff --git a/...ons/_relation-vip_group_lb_vip-e0213ce.md → ...escriptions/_relation-lb_nginx-514d407.md b/...ons/_relation-vip_group_lb_vip-e0213ce.md → ...escriptions/_relation-lb_nginx-514d407.md
diff --git a/...scriptions/_relation-git_users-f6b1727.md → ...ons/_relation-vip_group_lb_vip-f0e7297.md b/...scriptions/_relation-git_users-f6b1727.md → ...ons/_relation-vip_group_lb_vip-f0e7297.md
diff --git a/example/3-tier/output/label-app.md b/example/3-tier/output/label-app.md
@@ -12,7 +12,7 @@ App-DB
 ## Relations
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-lb_nginx-d49ef52.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-lb_nginx-514d407.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -23,7 +23,7 @@ App-DB
 
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-app_rails_app-5315b66.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-app_rails_app-7e41335.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |

diff --git a/example/3-tier/output/label-http.md b/example/3-tier/output/label-http.md
@@ -10,10 +10,9 @@ HTTP request flow
 <p>
 
 ## Relations
-internet -> vip
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-internet-c6eb5ba.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-internet-4046636.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -23,7 +22,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-vip_group_lb_vip-e0213ce.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-vip_group_lb_vip-f0e7297.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -33,7 +32,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-lb_nginx-d49ef52.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-lb_nginx-514d407.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -44,7 +43,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../input/ndiag.descriptions/_relation-lb_keepalived-462761b.md">:pencil2: Edit description</a> ]
+  [ <a href="../input/ndiag.descriptions/_relation-lb_keepalived-afc5653.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |

diff --git a/...ons/_relation-lambda_function2-7e28e18.md → ...scriptions/_relation-git_users-14ba713.md b/...ons/_relation-lambda_function2-7e28e18.md → ...scriptions/_relation-git_users-14ba713.md
diff --git a/...ons/_relation-lambda_function2-a082168.md → ...ons/_relation-lambda_function2-7ef7b6c.md b/...ons/_relation-lambda_function2-a082168.md → ...ons/_relation-lambda_function2-7ef7b6c.md
diff --git a/...ons/_relation-lambda_function2-d5dae48.md → ...ons/_relation-lambda_function2-86c8d48.md b/...ons/_relation-lambda_function2-d5dae48.md → ...ons/_relation-lambda_function2-86c8d48.md
diff --git a/...descriptions/_relation-browser-d1b8c42.md → ...ons/_relation-lambda_function2-a1cbfde.md b/...descriptions/_relation-browser-d1b8c42.md → ...ons/_relation-lambda_function2-a1cbfde.md
diff --git a/...ervice_instance_compute_engine-6b327de.md → ...descriptions/_relation-browser-3bb13e8.md b/...ervice_instance_compute_engine-6b327de.md → ...descriptions/_relation-browser-3bb13e8.md
diff --git a/...ervice_instance_compute_engine-e6e34d1.md → ...ervice_instance_compute_engine-2f9d9af.md b/...ervice_instance_compute_engine-e6e34d1.md → ...ervice_instance_compute_engine-2f9d9af.md
diff --git a/..._platform_cloud_load_balancing-60f3ec8.md → ...ervice_instance_compute_engine-ee4a537.md b/..._platform_cloud_load_balancing-60f3ec8.md → ...ervice_instance_compute_engine-ee4a537.md
diff --git a/...descriptions/_relation-browser-ec2def1.md → ..._platform_cloud_load_balancing-55e948d.md b/...descriptions/_relation-browser-ec2def1.md → ..._platform_cloud_load_balancing-55e948d.md
diff --git a/.../_relation-my-namespace_my-hpa-0469f58.md → ...descriptions/_relation-browser-66ffe84.md b/.../_relation-my-namespace_my-hpa-0469f58.md → ...descriptions/_relation-browser-66ffe84.md
diff --git a/...s/_relation-my-namespace_my-rs-0905255.md → .../_relation-my-namespace_my-hpa-adaea56.md b/...s/_relation-my-namespace_my-rs-0905255.md → .../_relation-my-namespace_my-hpa-adaea56.md
diff --git a/...s/_relation-my-namespace_my-rs-0bf1c05.md → ...s/_relation-my-namespace_my-rs-5314af7.md b/...s/_relation-my-namespace_my-rs-0bf1c05.md → ...s/_relation-my-namespace_my-rs-5314af7.md
diff --git a/...s/_relation-my-namespace_my-rs-24329a4.md → ...s/_relation-my-namespace_my-rs-a25eb5a.md b/...s/_relation-my-namespace_my-rs-24329a4.md → ...s/_relation-my-namespace_my-rs-a25eb5a.md
diff --git a/.../_relation-my-namespace_my-svc-0049332.md → ...s/_relation-my-namespace_my-rs-af55dbf.md b/.../_relation-my-namespace_my-svc-0049332.md → ...s/_relation-my-namespace_my-rs-af55dbf.md
diff --git a/.../_relation-my-namespace_my-svc-0507c8f.md → .../_relation-my-namespace_my-svc-020c27f.md b/.../_relation-my-namespace_my-svc-0507c8f.md → .../_relation-my-namespace_my-svc-020c27f.md
diff --git a/.../_relation-my-namespace_my-svc-5820bdc.md → .../_relation-my-namespace_my-svc-c6b3357.md b/.../_relation-my-namespace_my-svc-5820bdc.md → .../_relation-my-namespace_my-svc-c6b3357.md
diff --git a/...n-my-namespace_your.domain.com-8c42986.md → .../_relation-my-namespace_my-svc-ee29bd4.md b/...n-my-namespace_your.domain.com-8c42986.md → .../_relation-my-namespace_my-svc-ee29bd4.md
diff --git a/...ptions/_relation-app_rails_app-5315b66.md → ...n-my-namespace_your.domain.com-0eaf9ea.md b/...ptions/_relation-app_rails_app-5315b66.md → ...n-my-namespace_your.domain.com-0eaf9ea.md
diff --git a/example/tutorial/final/docs/arch/label-app.md b/example/tutorial/final/docs/arch/label-app.md
@@ -12,7 +12,7 @@ App-DB
 ## Relations
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-lb_nginx-d49ef52.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-lb_nginx-514d407.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -23,7 +23,7 @@ App-DB
 
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-app_rails_app-5315b66.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-app_rails_app-7e41335.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |

diff --git a/example/tutorial/final/docs/arch/label-http.md b/example/tutorial/final/docs/arch/label-http.md
@@ -10,10 +10,9 @@ HTTP request flow
 <p>
 
 ## Relations
-internet -> vip
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-internet-c6eb5ba.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-internet-4046636.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -23,7 +22,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-vip_group_lb_vip-e0213ce.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-vip_group_lb_vip-f0e7297.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -33,7 +32,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-lb_nginx-d49ef52.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-lb_nginx-514d407.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |
@@ -44,7 +43,7 @@ internet -> vip
 
 
 <p align="right">
-  [ <a href="../../ndiag.descriptions/_relation-lb_keepalived-462761b.md">:pencil2: Edit description</a> ]
+  [ <a href="../../ndiag.descriptions/_relation-lb_keepalived-afc5653.md">:pencil2: Edit description</a> ]
 <p>
 
 | # | Component | Description |

diff --git a/...ptions/_relation-lb_keepalived-462761b.md → ...ptions/_relation-app_rails_app-7e41335.md b/...ptions/_relation-lb_keepalived-462761b.md → ...ptions/_relation-app_rails_app-7e41335.md
diff --git a/...escriptions/_relation-lb_nginx-d49ef52.md → ...escriptions/_relation-internet-4046636.md b/...escriptions/_relation-lb_nginx-d49ef52.md → ...escriptions/_relation-internet-4046636.md
diff --git a/...ons/_relation-vip_group_lb_vip-e0213ce.md → ...ptions/_relation-lb_keepalived-afc5653.md b/...ons/_relation-vip_group_lb_vip-e0213ce.md → ...ptions/_relation-lb_keepalived-afc5653.md
diff --git a/example/tutorial/final/ndiag.descriptions/_relation-lb_nginx-514d407.md b/example/tutorial/final/ndiag.descriptions/_relation-lb_nginx-514d407.md
diff --git a/example/tutorial/final/ndiag.descriptions/_relation-vip_group_lb_vip-f0e7297.md b/example/tutorial/final/ndiag.descriptions/_relation-vip_group_lb_vip-f0e7297.md