sanitize HTML files (open-telemetry#137)

wayfair-contribs · Jun 14, 2022 · 2d41195 · 2d41195
1 parent 7c5cee8
commit 2d41195
Show file tree

Hide file tree

Showing 11 changed files with 210 additions and 210 deletions.
diff --git a/internal/tools/sanitycheck.py b/internal/tools/sanitycheck.py
@@ -74,18 +74,18 @@ def sanitycheck(pattern, allow_utf8 = False, allow_eol = (CRLF, LF), indent = 1)
 retval = 0
 retval += sanitycheck('**/Dockerfile', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.cmd', allow_eol = (CRLF,), indent = 2)
-retval += sanitycheck('**/*.config', allow_utf8 = True, allow_eol = (LF,), indent = 2)
-retval += sanitycheck('**/*.cs', allow_utf8 = True, allow_eol = (LF,))
-retval += sanitycheck('**/*.csproj', allow_utf8 = True, allow_eol = (LF,), indent = 2)
-# retval += sanitycheck('**/*.htm', allow_eol = (LF,), indent = 4)
-# retval += sanitycheck('**/*.html', allow_eol = (LF,), indent = 4)
+retval += sanitycheck('**/*.config', allow_eol = (LF,), indent = 2)
+retval += sanitycheck('**/*.cs', allow_eol = (LF,))
+retval += sanitycheck('**/*.csproj', allow_eol = (LF,), indent = 2)
+retval += sanitycheck('**/*.htm', allow_eol = (LF,), indent = 4)
+retval += sanitycheck('**/*.html', allow_eol = (LF,), indent = 4)
 retval += sanitycheck('**/*.md', allow_eol = (LF,))
 retval += sanitycheck('**/*.proj', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.props', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.py', allow_eol = (LF,), indent = 4)
 retval += sanitycheck('**/*.sln', allow_utf8 = True, indent = 4)
 retval += sanitycheck('**/*.targets', allow_eol = (LF,), indent = 2)
-# retval += sanitycheck('**/*.xml', allow_eol = (LF,), indent = 4)
+retval += sanitycheck('**/*.xml', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.yml', allow_eol = (LF,), indent = 2)
 
 sys.exit(retval)
diff --git a/src/adservice/src/main/resources/log4j2.xml b/src/adservice/src/main/resources/log4j2.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <Configuration status="WARN">
   <Appenders>
     <Console name="STDOUT" target="SYSTEM_OUT">
-        <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %n"/>
+      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} - %logger{36} - %msg trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %n"/>
     </Console>
   </Appenders>
   <Loggers>

diff --git a/src/frontend/templates/ad.html b/src/frontend/templates/ad.html
@@ -1,17 +1,17 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "text_ad" }}
@@ -23,4 +23,4 @@
         </a>
     </div>
 </div>
-{{ end }}
+{{ end }}
diff --git a/src/frontend/templates/cart.html b/src/frontend/templates/cart.html
@@ -1,28 +1,28 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "cart" }}
     {{ template "header" . }}
-    
+
     <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
         <span class="platform-flag">
             {{$.platform_name}}
         </span>
     </div>
-    
+
     <main role="main" class="cart-sections">
 
         {{ if eq (len $.items) 0 }}

diff --git a/src/frontend/templates/error.html b/src/frontend/templates/error.html
@@ -1,26 +1,26 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "error" }}
     {{ template "header" . }}
     <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
         <span class="platform-flag">
-          {{$.platform_name}}
+            {{$.platform_name}}
         </span>
-      </div>
+    </div>
     <main role="main">
         <div class="py-5">
             <div class="container bg-light py-3 px-lg-5 py-lg-5">
@@ -37,4 +37,4 @@ <h1>Uh, oh!</h1>
     </main>
 
     {{ template "footer" . }}
-    {{ end }}
+    {{ end }}
diff --git a/src/frontend/templates/footer.html b/src/frontend/templates/footer.html
@@ -1,17 +1,17 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "footer" }}
@@ -20,10 +20,10 @@
     <div class="footer-top">
         <div class="container footer-social">
             <p class="footer-text">This website is hosted for demo purposes only. It is not an actual shop. This is not a Google product.</p>
-            <p class="footer-text">© 2022 OpenTelemetry (<a href="https://github.com/open-telemetry/opentelemetry-demo-webstore">Source Code</a>)</p>
+            <p class="footer-text">@ 2022 OpenTelemetry (<a href="https://github.com/open-telemetry/opentelemetry-demo-webstore">Source Code</a>)</p>
             <p class="footer-text">
                 <small>
-                    {{ if $.session_id }}session-id: {{ $.session_id }} — {{end}}
+                    {{ if $.session_id }}session-id: {{ $.session_id }} - {{end}}
                     {{ if $.request_id }}request-id: {{ $.request_id }}{{end}}
                 </small>
                 <br/>

diff --git a/src/frontend/templates/header.html b/src/frontend/templates/header.html
@@ -1,17 +1,17 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "header" }}
@@ -89,4 +89,4 @@
         </div>
 
     </header>
-    {{end}}
+    {{end}}
diff --git a/src/frontend/templates/home.html b/src/frontend/templates/home.html
@@ -1,78 +1,78 @@
 <!--
- Copyright 2020 Google LLC
+Copyright 2020 Google LLC
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 {{ define "home" }}
 
 {{ template "header" . }}
 <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-  <span class="platform-flag">
-    {{$.platform_name}}
-  </span>
+    <span class="platform-flag">
+        {{$.platform_name}}
+    </span>
 </div>
 <main role="main" class="home">
 
-  <!-- The image at the top of the home page, displayed on smaller screens. -->
-  <div class="home-mobile-hero-banner d-lg-none"></div>
+    <!-- The image at the top of the home page, displayed on smaller screens. -->
+    <div class="home-mobile-hero-banner d-lg-none"></div>
 
-  <div class="container-fluid">
-    <div class="row">
+    <div class="container-fluid">
+        <div class="row">
 
-      <!-- The image on the left of the home page, displayed on larger screens. -->
-      <div class="col-4 d-none d-lg-block home-desktop-left-image"></div>
+            <!-- The image on the left of the home page, displayed on larger screens. -->
+            <div class="col-4 d-none d-lg-block home-desktop-left-image"></div>
 
-      <div class="col-12 col-lg-8">
+            <div class="col-12 col-lg-8">
 
-        <div class="row hot-products-row px-xl-6">
+                <div class="row hot-products-row px-xl-6">
 
-          <div class="col-12">
-            <h3>Hot Products</h3>
-          </div>
+                    <div class="col-12">
+                        <h3>Hot Products</h3>
+                    </div>
 
-          {{ range $.products }}
-          <div class="col-md-4 hot-product-card">
-            <a href="/product/{{.Item.Id}}">
-              <img alt="" src="{{.Item.Picture}}">
-              <div class="hot-product-card-img-overlay"></div>
-            </a>
-            <div>
-              <div class="hot-product-card-name">{{ .Item.Name }}</div>
-              <div class="hot-product-card-price">{{ renderMoney .Price }}</div>
-            </div>
-          </div>
-          {{ end }}
+                    {{ range $.products }}
+                    <div class="col-md-4 hot-product-card">
+                        <a href="/product/{{.Item.Id}}">
+                            <img alt="" src="{{.Item.Picture}}">
+                            <div class="hot-product-card-img-overlay"></div>
+                        </a>
+                        <div>
+                            <div class="hot-product-card-name">{{ .Item.Name }}</div>
+                            <div class="hot-product-card-price">{{ renderMoney .Price }}</div>
+                        </div>
+                    </div>
+                    {{ end }}
 
-        </div>
+                </div>
 
-        <!-- Footer for larger screens. -->
-        <div class="row d-none d-lg-block home-desktop-footer-row">
-          <div class="col-12 p-0">
-            {{ template "footer" . }}
-          </div>
-        </div>
+                <!-- Footer for larger screens. -->
+                <div class="row d-none d-lg-block home-desktop-footer-row">
+                    <div class="col-12 p-0">
+                        {{ template "footer" . }}
+                    </div>
+                </div>
 
-      </div>
+            </div>
 
+        </div>
     </div>
-  </div>
 
 </main>
 
 <!-- Footer for smaller screens. -->
 <div class="d-lg-none">
-  {{ template "footer" . }}
+    {{ template "footer" . }}
 </div>
 
-{{ end }}
+{{ end }}