Skip to content
Permalink
Browse files
fix: spelling
* spelling: accessing

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: autocompletion

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: available

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: belong

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: berkeley

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: configuration

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: container

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: context

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: convenient

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: duplication

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: existence

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: exists

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: htpasswd

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: kubernetes

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: length

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: occurred

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: prefixes

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: record

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: requests

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: searches

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: secondary

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: synchronization

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: temporarily

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: transferring

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: until

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: wait

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
  • Loading branch information
jsoref committed Oct 7, 2021
1 parent 9cca53d commit 994af880a8e00d52437227a82e52d0b184a17ae0
@@ -29,7 +29,7 @@ go generate ./...

### Ease development

`werf.py` and `live.py` are copied into tmp directory that mounted into stage contatainer. To ease
`werf.py` and `live.py` are copied into tmp directory that mounted into stage container. To ease
development of ansible callbacks, werf can create hardlinks for werf.py and live.py if
`WERF_DEBUG_ANSIBLE_WERF_PY_PATH` or `WERF_DEBUG_ANSIBLE_LIVE_PY_PATH` environment variables are set.

@@ -485,13 +485,13 @@ func createMaintenanceHelper(ctx context.Context, actionConfig *action.Configura

func migrateHelm2ToHelm3(ctx context.Context, releaseName, namespace string, maintenanceHelper *maintenance_helper.MaintenanceHelper, postRenderer postrender.PostRenderer, valueOpts *values.Options, fullChartDir string, registryClientHandle *helm_v3.RegistryClientHandle) error {
if helm2Exists, err := checkHelm2AvailableAndReleaseExists(ctx, releaseName, namespace, maintenanceHelper); err != nil {
return fmt.Errorf("error checking availability of helm 2 and existance of helm 2 release %q: %s", releaseName, err)
return fmt.Errorf("error checking availability of helm 2 and existence of helm 2 release %q: %s", releaseName, err)
} else if !helm2Exists {
return nil
}

if helm3Exists, err := checkHelm3ReleaseExists(ctx, releaseName, namespace, maintenanceHelper); err != nil {
return fmt.Errorf("error checking existance of helm 3 release %q: %s", releaseName, err)
return fmt.Errorf("error checking existence of helm 3 release %q: %s", releaseName, err)
} else if helm3Exists {
// helm 2 exists and helm 3 exists
// migration not needed, but we should warn user that some helm 2 release with the same name exists
@@ -545,7 +545,7 @@ func checkHelm2AvailableAndReleaseExists(ctx context.Context, releaseName, names
} else if available {
foundHelm2Release, err := maintenanceHelper.IsHelm2ReleaseExist(ctx, releaseName)
if err != nil {
return false, fmt.Errorf("error checking existance of helm 2 release %q: %s", releaseName, err)
return false, fmt.Errorf("error checking existence of helm 2 release %q: %s", releaseName, err)
}

return foundHelm2Release, nil
@@ -557,7 +557,7 @@ func checkHelm2AvailableAndReleaseExists(ctx context.Context, releaseName, names
func checkHelm3ReleaseExists(ctx context.Context, releaseName, namespace string, maintenanceHelper *maintenance_helper.MaintenanceHelper) (bool, error) {
foundHelm3Release, err := maintenanceHelper.IsHelm3ReleaseExist(ctx, releaseName)
if err != nil {
return false, fmt.Errorf("error checking existance of helm 3 release %q: %s", releaseName, err)
return false, fmt.Errorf("error checking existence of helm 3 release %q: %s", releaseName, err)
}

return foundHelm3Release, nil
@@ -18,7 +18,7 @@ directives:
- name: allowUncommittedTemplates
value: "[ glob, ... ]"
description:
en: Read the certain configutation file templates (.werf/**/*.tmpl) from the project directory despite the state in git repository and .gitignore rules
en: Read the certain configuration file templates (.werf/**/*.tmpl) from the project directory despite the state in git repository and .gitignore rules
ru: Читать определённые шаблоны конфигурационного файла (.werf/**/*.tmpl) из директории проекта, не сверяя контент с файлами текущего коммита и игнорируя исключения в .gitignore
- name: goTemplateRendering
description:
@@ -35,7 +35,7 @@ directives:
- name: allowUncommittedFiles
value: "[ glob, ... ]"
description:
en: Read the certain configutation files from the project directory despite the state in git repository and .gitignore rules (using .Files.Get and .Files.Glob functions)
en: Read the certain configuration files from the project directory despite the state in git repository and .gitignore rules (using .Files.Get and .Files.Glob functions)
ru: Читать определённые конфигурационные файлы из директории проекта, не сверяя контент с файлами текущего коммита и игнорируя исключения в .gitignore (используя функции .Files.Get и .Files.Glob)
- name: stapel
description:
@@ -8,7 +8,7 @@ directive_summary: git

***Git mapping*** describes a file or a directory in the git repository that should be added to the image at the particular path. The repository may be a local one, hosted in the directory that contains the config, or a remote one. In the latter case, the configuration of the _git mapping_ includes a repository address and version (branch, tag, or commit hash).

werf adds files from the repository to the image either by fully transferring them via git archive or by applying patches between commits. The full transfer is used to add files initially. Subsequent builds apply patches to reflect changes in a git repository. You can learn more about the algorithm behind fully transfering and applying patches in the [More details: git_archive...](#more-details-gitarchive-gitcache-gitlatestpatch) section.
werf adds files from the repository to the image either by fully transferring them via git archive or by applying patches between commits. The full transfer is used to add files initially. Subsequent builds apply patches to reflect changes in a git repository. You can learn more about the algorithm behind fully transferring and applying patches in the [More details: git_archive...](#more-details-gitarchive-gitcache-gitlatestpatch) section.

The configuration of _git mappings_ supports filtering of files, and you can use a set of _git mappings_ to create virtually any file structure in the image. Also, you can specify the owner and the group of files in the _git mapping_ configuration, without the need to run `chown`.

@@ -10,7 +10,7 @@ Synchronization is a group of service components of the werf to coordinate multi

All commands that requires storage (`--repo`) param also use _synchronization service components_ address, which defined by the `--synchronization` option or `WERF_SYNCHRONIZATION=...` environment variable.

There are 3 types of sycnhronization components:
There are 3 types of synchronization components:
1. Local. Selected by `--synchronization=:local` param.
- Local _storage cache_ is stored in the `~/.werf/shared_context/storage/stages_storage_cache/1/PROJECT_NAME/DIGEST` files by default, each file contains a mapping of images existing in storage by some digest.
- Local _lock manager_ uses OS file-locks in the `~/.werf/service/locks` as implementation of locks.
@@ -102,7 +102,7 @@ branch: master
branch: /^(master|production)$/
```

> When scanning, werf searchs for the provided set of git branches in the origin remote references, but in the configuration, the `origin/` prefix is omitted in branch names.
> When scanning, werf searches for the provided set of git branches in the origin remote references, but in the configuration, the `origin/` prefix is omitted in branch names.
You can limit the set of references on the basis of the date when the git tag was created or the activity in the git branch. The `limit` group of parameters allows the user to define flexible and efficient policies for various workflows.

@@ -252,7 +252,7 @@ Removed `.Values.global.werf.image` section, use `.Values.werf.image` instead.
## Primary and secondary images storage support

- Automatically upload locally built images into the specified `--repo`.
- Use stages from read-only secondary images storage specified by `--secodary-repo` options (can be specified multiple times).
- Use stages from read-only secondary images storage specified by `--secondary-repo` options (can be specified multiple times).
- Suitable stages from the `--secondary-repo` will be copied into the primary `--repo`.

## Built images report format changes
@@ -11,7 +11,7 @@ Get status info (JSON).
- 'msg' — Empty if `status` is `ok`, otherwise contains text representation of the error.
- `rootVersion` — Version to show as main. E.g. - `v1.2.4+fix18`.
- `rootVersionURL` — URL location for RootVersion. E.g. - `v1.2.4-plus-fix18`.
- `multiwerf` — content of the used multiwerf.json (info about which versions belog to update channels)
- `multiwerf` — content of the used multiwerf.json (info about which versions belong to update channels)

Example:
```json
@@ -64,7 +64,7 @@ func groupHandler(w http.ResponseWriter, r *http.Request) {
}

// Handles request to /v<group>-<channel>/. E.g. /v1.2-beta/
// Temprarily redirect to specific version
// Temporarily redirect to specific version
func groupChannelHandler(w http.ResponseWriter, r *http.Request) {
log.Debugln("Use handler - groupChannelHandler")
pageURLRelative := "/"
@@ -72,7 +72,7 @@ $(document).ready(function () {
var github_requests = [],
github_stats = JSON.parse(localStorage.getItem('werf_github_stats')) || null;

function getGithubReuests() {
function getGithubRequests() {
$('[data-roadmap-step]').each(function () {
var $step = $(this);
github_requests.push($.get('https://api.github.com/repos/werf/werf/issues/' + $step.data('roadmap-step'), function (data) {
@@ -97,7 +97,7 @@ $(document).ready(function () {

if (github_stats == null || Date.now() > (github_stats['updated_on'] + 1000 * 60 * 60)) {
github_stats = {'updated_on': Date.now(), 'issues': {}, 'stargazers': 0};
$.when.apply($, getGithubReuests()).done(function() {
$.when.apply($, getGithubRequests()).done(function() {
updateGithubStats();
localStorage.setItem('werf_github_stats', JSON.stringify(github_stats));
});
@@ -157,7 +157,7 @@ $(document).ready(function() {
});

$(document).ready(function(){
// waint untill fonts are loaded
// wait until fonts are loaded
setTimeout(function() {
$('.publications__list').masonry({
itemSelector: '.publications__post',
@@ -134,7 +134,7 @@ var _ = SuiteData.SetupProjectName(suite_init.NewProjectNameData(SuiteData.Stubs

### `Describe`, `Context` and `It`

When your test uses werf project it is convinient to create a special `Context` block within `Describe` for each project.
When your test uses werf project it is convenient to create a special `Context` block within `Describe` for each project.

In this `Context` single `It` block should be defined for the actual test code and `AfterEach` block to perform cleanup for the project (typically `werf purge --force` and `werf dismiss ...`).

@@ -125,7 +125,7 @@ var _ = Describe("Kubedog multitrack — werf's kubernetes resources tracker", f
utils.RunCommand(SuiteData.GetProjectWorktree(SuiteData.ProjectName), SuiteData.WerfBinPath, "dismiss", "--with-namespace")
})

It("should report ImagePullBackoff occured in Deployment and werf should fail", func() {
It("should report ImagePullBackoff occurred in Deployment and werf should fail", func() {
SuiteData.CommitProjectWorktree(SuiteData.ProjectName, "kubedog_multitrack_app2", "initial commit")

gotImagePullBackoffLine := false
@@ -273,7 +273,7 @@ def _display_msg(self, task, result, color):
self.LogArgs(stringc(result['results'][0], color), "\n")
return

# prevent dublication of stdout in case of live_stdout
# prevent duplication of stdout in case of live_stdout
if not self._live_stdout_listener.is_live_stdout():
stdout = result.get('stdout', result.get('module_stdout', ''))
if stdout:
@@ -210,8 +210,8 @@ func descentPath(filePath string) []string {
return parts
}

func generateSecureRandomString(lenght int) string {
randomBytes := make([]byte, lenght)
func generateSecureRandomString(length int) string {
randomBytes := make([]byte, length)
if _, err := rand.Read(randomBytes); err != nil {
panic(fmt.Sprintf("cannot generate secure random string: %s", err))
}
@@ -47,7 +47,7 @@ func GetContextAddFilesPaths(projectDir string, contextDir string, contextAddFil
addFilePaths = append(addFilePaths, path)
return nil
}); err != nil {
return nil, fmt.Errorf("error occured when recursively walking the contextAddFile dir %q: %s", addFilePath, err)
return nil, fmt.Errorf("error occurred when recursively walking the contextAddFile dir %q: %s", addFilePath, err)
}
} else {
addFilePaths = append(addFilePaths, addFilePath)
@@ -15,7 +15,7 @@ import (
func Migrate2To3(ctx context.Context, helm2ReleaseName, helm3ReleaseName, helm3Namespace string, maintenanceHelper *MaintenanceHelper) error {
foundHelm3Release, err := maintenanceHelper.IsHelm3ReleaseExist(ctx, helm3ReleaseName)
if err != nil {
return fmt.Errorf("error checking existance of helm 3 release %q: %s", helm2ReleaseName, err)
return fmt.Errorf("error checking existence of helm 3 release %q: %s", helm2ReleaseName, err)
}

if foundHelm3Release {
@@ -24,7 +24,7 @@ func Migrate2To3(ctx context.Context, helm2ReleaseName, helm3ReleaseName, helm3N

foundHelm2Release, err := maintenanceHelper.IsHelm2ReleaseExist(ctx, helm2ReleaseName)
if err != nil {
return fmt.Errorf("error checking existance of helm 2 release %q: %s", helm2ReleaseName, err)
return fmt.Errorf("error checking existence of helm 2 release %q: %s", helm2ReleaseName, err)
}

if !foundHelm2Release {
@@ -155,7 +155,7 @@ func GetLocalDockerServerStorageCheck(ctx context.Context, dockerServerStoragePa
}

// No werf v1.1 runs on this host.
// This is stupid check, but the only awailalble safe option at the moment.
// This is stupid check, but the only available safe option at the moment.
if t.IsZero() {
filterSet := filters.NewArgs()

@@ -131,12 +131,12 @@ func hexToBinary(data []byte) ([]byte, error) {
}

func IsExtractDataError(err error) bool {
dataErrorPrefixs := []string{
dataErrorPrefixes := []string{
"minimum required data length",
"encoding/hex: odd length hex string",
}

for _, prefix := range dataErrorPrefixs {
for _, prefix := range dataErrorPrefixes {
if strings.HasPrefix(err.Error(), prefix) {
return true
}
@@ -19,8 +19,8 @@ import (
"github.com/werf/werf/pkg/werf"
)

func NewKubernetesLockManager(namespace string, kubeClient kubernetes.Interface, kubeDynamicClient dynamic.Interface, getConfigMapNameFunc func(projectName string) string) *KuberntesLockManager {
return &KuberntesLockManager{
func NewKubernetesLockManager(namespace string, kubeClient kubernetes.Interface, kubeDynamicClient dynamic.Interface, getConfigMapNameFunc func(projectName string) string) *KubernetesLockManager {
return &KubernetesLockManager{
KubeClient: kubeClient,
KubeDynamicClient: kubeDynamicClient,
Namespace: namespace,
@@ -29,7 +29,7 @@ func NewKubernetesLockManager(namespace string, kubeClient kubernetes.Interface,
}
}

type KuberntesLockManager struct {
type KubernetesLockManager struct {
KubeClient kubernetes.Interface
KubeDynamicClient dynamic.Interface
Namespace string
@@ -39,7 +39,7 @@ type KuberntesLockManager struct {
mux sync.Mutex
}

func (manager *KuberntesLockManager) getLockerForProject(ctx context.Context, projectName string) (lockgate.Locker, error) {
func (manager *KubernetesLockManager) getLockerForProject(ctx context.Context, projectName string) (lockgate.Locker, error) {
manager.mux.Lock()
defer manager.mux.Unlock()

@@ -66,7 +66,7 @@ func (manager *KuberntesLockManager) getLockerForProject(ctx context.Context, pr
return locker, nil
}

func (manager *KuberntesLockManager) LockStage(ctx context.Context, projectName, digest string) (LockHandle, error) {
func (manager *KubernetesLockManager) LockStage(ctx context.Context, projectName, digest string) (LockHandle, error) {
if locker, err := manager.getLockerForProject(ctx, projectName); err != nil {
return LockHandle{}, err
} else {
@@ -75,7 +75,7 @@ func (manager *KuberntesLockManager) LockStage(ctx context.Context, projectName,
}
}

func (manager *KuberntesLockManager) LockStageCache(ctx context.Context, projectName, digest string) (LockHandle, error) {
func (manager *KubernetesLockManager) LockStageCache(ctx context.Context, projectName, digest string) (LockHandle, error) {
if locker, err := manager.getLockerForProject(ctx, projectName); err != nil {
return LockHandle{}, err
} else {
@@ -84,7 +84,7 @@ func (manager *KuberntesLockManager) LockStageCache(ctx context.Context, project
}
}

func (manager *KuberntesLockManager) Unlock(ctx context.Context, lock LockHandle) error {
func (manager *KubernetesLockManager) Unlock(ctx context.Context, lock LockHandle) error {
if locker, err := manager.getLockerForProject(ctx, lock.ProjectName); err != nil {
return err
} else {
@@ -323,9 +323,9 @@ func (storage *LocalDockerServerStagesStorage) PostClientIDRecord(ctx context.Co

logboek.Context(ctx).Debug().LogF("-- LocalDockerServerStagesStorage.PostClientID full image name: %s\n", fullImageName)

if exsts, err := docker.ImageExist(ctx, fullImageName); err != nil {
if exists, err := docker.ImageExist(ctx, fullImageName); err != nil {
return fmt.Errorf("unable to check existence of image %q: %s", fullImageName, err)
} else if exsts {
} else if exists {
return nil
}

@@ -31,8 +31,8 @@ const (
RepoImportMetadata_ImageTagPrefix = "import-metadata-"
RepoImportMetadata_ImageNameFormat = "%s:import-metadata-%s"

RepoClientIDRecrod_ImageTagPrefix = "client-id-"
RepoClientIDRecrod_ImageNameFormat = "%s:client-id-%s-%d"
RepoClientIDRecord_ImageTagPrefix = "client-id-"
RepoClientIDRecord_ImageNameFormat = "%s:client-id-%s-%d"

UnexpectedTagFormatErrorPrefix = "unexpected tag format"
)
@@ -697,11 +697,11 @@ func (storage *RepoStagesStorage) GetClientIDRecords(ctx context.Context, projec
return nil, fmt.Errorf("unable to get repo %s tags: %s", storage.RepoAddress, err)
} else {
for _, tag := range tags {
if !strings.HasPrefix(tag, RepoClientIDRecrod_ImageTagPrefix) {
if !strings.HasPrefix(tag, RepoClientIDRecord_ImageTagPrefix) {
continue
}

tagWithoutPrefix := strings.TrimPrefix(tag, RepoClientIDRecrod_ImageTagPrefix)
tagWithoutPrefix := strings.TrimPrefix(tag, RepoClientIDRecord_ImageTagPrefix)
dataParts := strings.SplitN(util.Reverse(tagWithoutPrefix), "-", 2)
if len(dataParts) != 2 {
continue
@@ -727,7 +727,7 @@ func (storage *RepoStagesStorage) GetClientIDRecords(ctx context.Context, projec
func (storage *RepoStagesStorage) PostClientIDRecord(ctx context.Context, projectName string, rec *ClientIDRecord) error {
logboek.Context(ctx).Debug().LogF("-- RepoStagesStorage.PostClientID %s for project %s\n", rec.ClientID, projectName)

fullImageName := fmt.Sprintf(RepoClientIDRecrod_ImageNameFormat, storage.RepoAddress, rec.ClientID, rec.TimestampMillisec)
fullImageName := fmt.Sprintf(RepoClientIDRecord_ImageNameFormat, storage.RepoAddress, rec.ClientID, rec.TimestampMillisec)

logboek.Context(ctx).Debug().LogF("-- RepoStagesStorage.PostClientID full image name: %s\n", fullImageName)

@@ -25,12 +25,12 @@ func ParseKubernetesSynchronization(address string) (*KubernetesSynchronizationP

res := &KubernetesSynchronizationParams{}

namespaceWithConextAndConfigParts := strings.SplitN(addressWithoutScheme, "@", 2)
namespaceWithContextAndConfigParts := strings.SplitN(addressWithoutScheme, "@", 2)
var namespaceWithContext, config string
if len(namespaceWithConextAndConfigParts) == 2 {
namespaceWithContext, config = namespaceWithConextAndConfigParts[0], namespaceWithConextAndConfigParts[1]
if len(namespaceWithContextAndConfigParts) == 2 {
namespaceWithContext, config = namespaceWithContextAndConfigParts[0], namespaceWithContextAndConfigParts[1]
} else {
namespaceWithContext = namespaceWithConextAndConfigParts[0]
namespaceWithContext = namespaceWithContextAndConfigParts[0]
}

namespaceAndContextParts := strings.SplitN(namespaceWithContext, ":", 2)
Loading

0 comments on commit 994af88

Please sign in to comment.