From 294b6854f6db50b6ea8a9d34fd99ab87d373f344 Mon Sep 17 00:00:00 2001 From: bootjp / Yoshiaki Ueda Date: Sat, 19 Feb 2022 20:32:23 +0900 Subject: [PATCH] test: fix typo GitHub is officially known as GitHub. https://github.com/logos Signed-off-by: bootjp / Yoshiaki Ueda --- .../framework/installer/ceph_manifests_previous.go | 14 +++++++------- tests/framework/installer/ceph_settings.go | 8 ++++---- tests/framework/installer/settings.go | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/framework/installer/ceph_manifests_previous.go b/tests/framework/installer/ceph_manifests_previous.go index 7db09e499..6e9fe45dd 100644 --- a/tests/framework/installer/ceph_manifests_previous.go +++ b/tests/framework/installer/ceph_manifests_previous.go @@ -38,36 +38,36 @@ func (m *CephManifestsPreviousVersion) Settings() *TestCephSettings { } func (m *CephManifestsPreviousVersion) GetCRDs(k8shelper *utils.K8sHelper) string { - return m.settings.readManifestFromGithub("crds.yaml") + return m.settings.readManifestFromGitHub("crds.yaml") } // GetRookOperator returns rook Operator manifest func (m *CephManifestsPreviousVersion) GetOperator() string { var manifest string if utils.IsPlatformOpenShift() { - manifest = m.settings.readManifestFromGithub("operator-openshift.yaml") + manifest = m.settings.readManifestFromGitHub("operator-openshift.yaml") } else { - manifest = m.settings.readManifestFromGithub("operator.yaml") + manifest = m.settings.readManifestFromGitHub("operator.yaml") } return m.settings.replaceOperatorSettings(manifest) } // GetCommon returns rook-cluster manifest func (m *CephManifestsPreviousVersion) GetCommon() string { - return m.settings.readManifestFromGithub("common.yaml") + return m.settings.readManifestFromGitHub("common.yaml") } // GetRookToolBox returns rook-toolbox manifest func (m *CephManifestsPreviousVersion) GetToolbox() string { if m.settings.DirectMountToolbox { - manifest := strings.ReplaceAll(m.settings.readManifestFromGithub("direct-mount.yaml"), "name: rook-direct-mount", "name: rook-ceph-tools") + manifest := strings.ReplaceAll(m.settings.readManifestFromGitHub("direct-mount.yaml"), "name: rook-direct-mount", "name: rook-ceph-tools") return strings.ReplaceAll(manifest, "app: rook-direct-mount", "app: rook-ceph-tools") } - return m.settings.readManifestFromGithub("toolbox.yaml") + return m.settings.readManifestFromGitHub("toolbox.yaml") } func (m *CephManifestsPreviousVersion) GetCommonExternal() string { - return m.settings.readManifestFromGithub("common-external.yaml") + return m.settings.readManifestFromGitHub("common-external.yaml") } //********************************************************************************** diff --git a/tests/framework/installer/ceph_settings.go b/tests/framework/installer/ceph_settings.go index f10998acb..7ac21093d 100644 --- a/tests/framework/installer/ceph_settings.go +++ b/tests/framework/installer/ceph_settings.go @@ -67,12 +67,12 @@ func (s *TestCephSettings) readManifest(filename string) string { return replaceNamespaces(manifest, manifest, s.OperatorNamespace, s.Namespace) } -func (s *TestCephSettings) readManifestFromGithub(filename string) string { - return s.readManifestFromGithubWithClusterNamespace(filename, s.Namespace) +func (s *TestCephSettings) readManifestFromGitHub(filename string) string { + return s.readManifestFromGitHubWithClusterNamespace(filename, s.Namespace) } -func (s *TestCephSettings) readManifestFromGithubWithClusterNamespace(filename, clusterNamespace string) string { - manifest := readManifestFromGithub(s.RookVersion, filename) +func (s *TestCephSettings) readManifestFromGitHubWithClusterNamespace(filename, clusterNamespace string) string { + manifest := readManifestFromGitHub(s.RookVersion, filename) return replaceNamespaces(filename, manifest, s.OperatorNamespace, clusterNamespace) } diff --git a/tests/framework/installer/settings.go b/tests/framework/installer/settings.go index 9b9e43060..ad01d6404 100644 --- a/tests/framework/installer/settings.go +++ b/tests/framework/installer/settings.go @@ -49,7 +49,7 @@ func buildURL(rookVersion, filename string) string { return fmt.Sprintf("%s/deploy/examples/%s", rookVersion, filename) } -func readManifestFromGithub(rookVersion, filename string) string { +func readManifestFromGitHub(rookVersion, filename string) string { url := fmt.Sprintf("https://raw.githubusercontent.com/rook/rook/%s", buildURL(rookVersion, filename)) return readManifestFromURL(url) }