diff --git a/Second-Assigment/04c1e62ff1955a0228d1b9b5cca4e0a8d968f3 b/Second-Assigment/04c1e62ff1955a0228d1b9b5cca4e0a8d968f3 new file mode 100644 index 0000000..bc6e246 Binary files /dev/null and b/Second-Assigment/04c1e62ff1955a0228d1b9b5cca4e0a8d968f3 differ diff --git a/Second-Assigment/36266bd150f42a86415fe4b82b2d788cb4874a b/Second-Assigment/36266bd150f42a86415fe4b82b2d788cb4874a new file mode 100644 index 0000000..69e3d15 Binary files /dev/null and b/Second-Assigment/36266bd150f42a86415fe4b82b2d788cb4874a differ diff --git a/Second-Assigment/3c7041b0cc7a6f30ebd23f3538a7f639d5debd b/Second-Assigment/3c7041b0cc7a6f30ebd23f3538a7f639d5debd new file mode 100644 index 0000000..4fd7d11 Binary files /dev/null and b/Second-Assigment/3c7041b0cc7a6f30ebd23f3538a7f639d5debd differ diff --git a/Second-Assigment/4800c8b1477353f4727c317c7390dabbf0a59b b/Second-Assigment/4800c8b1477353f4727c317c7390dabbf0a59b new file mode 100644 index 0000000..2c6ff46 Binary files /dev/null and b/Second-Assigment/4800c8b1477353f4727c317c7390dabbf0a59b differ diff --git a/Second-Assigment/4fa795c302f639b9aa5f79c26062c39c52b192 b/Second-Assigment/4fa795c302f639b9aa5f79c26062c39c52b192 new file mode 100644 index 0000000..2ac4269 Binary files /dev/null and b/Second-Assigment/4fa795c302f639b9aa5f79c26062c39c52b192 differ diff --git a/Second-Assigment/5c9e6f42bffad4cd6b38187d690110fd6d6ea7 b/Second-Assigment/5c9e6f42bffad4cd6b38187d690110fd6d6ea7 new file mode 100644 index 0000000..bfaee05 Binary files /dev/null and b/Second-Assigment/5c9e6f42bffad4cd6b38187d690110fd6d6ea7 differ diff --git a/Second-Assigment/872b90f5a12935f47ef63d508ee5e078d2a9dc b/Second-Assigment/872b90f5a12935f47ef63d508ee5e078d2a9dc new file mode 100644 index 0000000..a3ee3a7 Binary files /dev/null and b/Second-Assigment/872b90f5a12935f47ef63d508ee5e078d2a9dc differ diff --git a/Second-Assigment/9ac16bb1fc9a6413618919f792f1a27415ac7b b/Second-Assigment/9ac16bb1fc9a6413618919f792f1a27415ac7b new file mode 100644 index 0000000..5304151 Binary files /dev/null and b/Second-Assigment/9ac16bb1fc9a6413618919f792f1a27415ac7b differ diff --git a/Second-Assigment/COMMIT_EDITMSG b/Second-Assigment/COMMIT_EDITMSG new file mode 100644 index 0000000..73d2f56 --- /dev/null +++ b/Second-Assigment/COMMIT_EDITMSG @@ -0,0 +1 @@ +Second Assigment diff --git a/Second-Assigment/Dockerfile b/Second-Assigment/Dockerfile new file mode 100644 index 0000000..868a645 --- /dev/null +++ b/Second-Assigment/Dockerfile @@ -0,0 +1,5 @@ +FROM openjdk:8-jre +ADD target/productcatalogue-0.0.1-SNAPSHOT.jar app.jar +ADD product-catalogue.yml app-config.yml +EXPOSE 8020 +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar", "server", "app-config.yml"] diff --git a/Second-Assigment/HEAD b/Second-Assigment/HEAD new file mode 100644 index 0000000..b870d82 --- /dev/null +++ b/Second-Assigment/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/Second-Assigment/README.md b/Second-Assigment/README.md new file mode 100644 index 0000000..06d7405 Binary files /dev/null and b/Second-Assigment/README.md differ diff --git a/Second-Assigment/applypatch-msg.sample b/Second-Assigment/applypatch-msg.sample new file mode 100644 index 0000000..a5d7b84 --- /dev/null +++ b/Second-Assigment/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/Second-Assigment/b0b26318a8753cd036652fa404fdf67a58fe0b b/Second-Assigment/b0b26318a8753cd036652fa404fdf67a58fe0b new file mode 100644 index 0000000..b1091bf Binary files /dev/null and b/Second-Assigment/b0b26318a8753cd036652fa404fdf67a58fe0b differ diff --git a/Second-Assigment/b7911a757bf6e4effc6592ed395cde9f9a59bd b/Second-Assigment/b7911a757bf6e4effc6592ed395cde9f9a59bd new file mode 100644 index 0000000..8c006be Binary files /dev/null and b/Second-Assigment/b7911a757bf6e4effc6592ed395cde9f9a59bd differ diff --git a/Second-Assigment/ba02f4a80edf22aca0e072afb4d921c7065bdb b/Second-Assigment/ba02f4a80edf22aca0e072afb4d921c7065bdb new file mode 100644 index 0000000..2d67e49 Binary files /dev/null and b/Second-Assigment/ba02f4a80edf22aca0e072afb4d921c7065bdb differ diff --git a/Second-Assigment/c981f490e46784b13d06a9e880e03ba5889ed9 b/Second-Assigment/c981f490e46784b13d06a9e880e03ba5889ed9 new file mode 100644 index 0000000..2067f20 Binary files /dev/null and b/Second-Assigment/c981f490e46784b13d06a9e880e03ba5889ed9 differ diff --git a/Second-Assigment/commit-msg.sample b/Second-Assigment/commit-msg.sample new file mode 100644 index 0000000..b58d118 --- /dev/null +++ b/Second-Assigment/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/Second-Assigment/config b/Second-Assigment/config new file mode 100644 index 0000000..2b2b402 --- /dev/null +++ b/Second-Assigment/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true +[remote "origin"] + url = git@git.kemt.fei.tuke.sk:al545ig/zkt24.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "main"] + remote = origin + merge = refs/heads/main diff --git a/Second-Assigment/dependency-reduced-pom.xml b/Second-Assigment/dependency-reduced-pom.xml new file mode 100644 index 0000000..3169182 --- /dev/null +++ b/Second-Assigment/dependency-reduced-pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + uk.co.danielbryant.djshopping + productcatalogue + 0.0.1-SNAPSHOT + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + maven-shade-plugin + + + package + + shade + + + + + + uk.co.danielbryant.djshopping.productcatalogue.ProductServiceApplication + + + + + + + 1.6 + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + UTF-8 + 1.3.27 + 4.2.3 + + diff --git a/Second-Assigment/description b/Second-Assigment/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/Second-Assigment/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/Second-Assigment/ef6469d65342b13843b02c8d4f75d58991998a b/Second-Assigment/ef6469d65342b13843b02c8d4f75d58991998a new file mode 100644 index 0000000..06ea9bd Binary files /dev/null and b/Second-Assigment/ef6469d65342b13843b02c8d4f75d58991998a differ diff --git a/Second-Assigment/exclude b/Second-Assigment/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/Second-Assigment/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/Second-Assigment/fsmonitor-watchman.sample b/Second-Assigment/fsmonitor-watchman.sample new file mode 100644 index 0000000..23e856f --- /dev/null +++ b/Second-Assigment/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/Second-Assigment/index b/Second-Assigment/index new file mode 100644 index 0000000..9ec04b6 Binary files /dev/null and b/Second-Assigment/index differ diff --git a/Second-Assigment/original-productcatalogue-0.0.1-SNAPSHOT.jar b/Second-Assigment/original-productcatalogue-0.0.1-SNAPSHOT.jar new file mode 100644 index 0000000..8b1655e Binary files /dev/null and b/Second-Assigment/original-productcatalogue-0.0.1-SNAPSHOT.jar differ diff --git a/Second-Assigment/packed-refs b/Second-Assigment/packed-refs new file mode 100644 index 0000000..250f187 --- /dev/null +++ b/Second-Assigment/packed-refs @@ -0,0 +1 @@ +# pack-refs with: peeled fully-peeled sorted diff --git a/Second-Assigment/pom.xml b/Second-Assigment/pom.xml new file mode 100644 index 0000000..f0faa8b --- /dev/null +++ b/Second-Assigment/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + uk.co.danielbryant.djshopping + shopfront + 0.0.1-SNAPSHOT + jar + + shopfront + Docker Java application Shopfront + + + org.springframework.boot + spring-boot-starter-parent + 1.5.22.RELEASE + + + + UTF-8 + 1.8 + + + + + + org.springframework.cloud + spring-cloud-dependencies + Dalston.SR5 + pom + import + + + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-hystrix + + + org.springframework.cloud + spring-cloud-starter-eureka + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.codehaus.mojo + versions-maven-plugin + + + + + diff --git a/Second-Assigment/post-update.sample b/Second-Assigment/post-update.sample new file mode 100644 index 0000000..ec17ec1 --- /dev/null +++ b/Second-Assigment/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/Second-Assigment/pre-applypatch.sample b/Second-Assigment/pre-applypatch.sample new file mode 100644 index 0000000..4142082 --- /dev/null +++ b/Second-Assigment/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/Second-Assigment/pre-commit.sample b/Second-Assigment/pre-commit.sample new file mode 100644 index 0000000..29ed5ee --- /dev/null +++ b/Second-Assigment/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/Second-Assigment/pre-merge-commit.sample b/Second-Assigment/pre-merge-commit.sample new file mode 100644 index 0000000..399eab1 --- /dev/null +++ b/Second-Assigment/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/Second-Assigment/pre-push.sample b/Second-Assigment/pre-push.sample new file mode 100644 index 0000000..4ce688d --- /dev/null +++ b/Second-Assigment/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/Second-Assigment/pre-rebase.sample b/Second-Assigment/pre-rebase.sample new file mode 100644 index 0000000..6cbef5c --- /dev/null +++ b/Second-Assigment/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/Second-Assigment/pre-receive.sample b/Second-Assigment/pre-receive.sample new file mode 100644 index 0000000..a1fd29e --- /dev/null +++ b/Second-Assigment/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/Second-Assigment/prepare-commit-msg.sample b/Second-Assigment/prepare-commit-msg.sample new file mode 100644 index 0000000..10fa14c --- /dev/null +++ b/Second-Assigment/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/Second-Assigment/product-catalogue.yml b/Second-Assigment/product-catalogue.yml new file mode 100644 index 0000000..466c289 --- /dev/null +++ b/Second-Assigment/product-catalogue.yml @@ -0,0 +1,10 @@ +version: 1.0-SNAPSHOT + + +server: + applicationConnectors: + - type: http + port: 8020 + adminConnectors: + - type: http + port: 8025 \ No newline at end of file diff --git a/Second-Assigment/productcatalogue-service.yaml b/Second-Assigment/productcatalogue-service.yaml new file mode 100644 index 0000000..2bb9992 --- /dev/null +++ b/Second-Assigment/productcatalogue-service.yaml @@ -0,0 +1,42 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: productcatalogue + labels: + app: productcatalogue +spec: + type: NodePort + selector: + app: productcatalogue + ports: + - protocol: TCP + port: 8020 + name: http + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: productcatalogue +spec: + selector: + matchLabels: + app: productcatalogue + replicas: 1 + template: + metadata: + labels: + app: productcatalogue + spec: + containers: + - name: productcatalogue + image: thetips4you/productcatalogue:latest + ports: + - containerPort: 8020 + livenessProbe: + httpGet: + path: /healthcheck + port: 8025 + initialDelaySeconds: 30 + timeoutSeconds: 1 diff --git a/Second-Assigment/push-to-checkout.sample b/Second-Assigment/push-to-checkout.sample new file mode 100644 index 0000000..af5a0c0 --- /dev/null +++ b/Second-Assigment/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/Second-Assigment/shopfront-0.0.1-SNAPSHOT.jar.original b/Second-Assigment/shopfront-0.0.1-SNAPSHOT.jar.original new file mode 100644 index 0000000..520d5b3 Binary files /dev/null and b/Second-Assigment/shopfront-0.0.1-SNAPSHOT.jar.original differ diff --git a/Second-Assigment/shopfront-service.yaml b/Second-Assigment/shopfront-service.yaml new file mode 100644 index 0000000..0fd6c69 --- /dev/null +++ b/Second-Assigment/shopfront-service.yaml @@ -0,0 +1,42 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: shopfront + labels: + app: shopfront +spec: + type: NodePort + selector: + app: shopfront + ports: + - protocol: TCP + port: 8010 + name: http + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: shopfront +spec: + selector: + matchLabels: + app: shopfront + replicas: 1 + template: + metadata: + labels: + app: shopfront + spec: + containers: + - name: shopfront + image: thetips4you/shopfront:latest + ports: + - containerPort: 8010 + livenessProbe: + httpGet: + path: /health + port: 8010 + initialDelaySeconds: 30 + timeoutSeconds: 1 diff --git a/Second-Assigment/stockmanager-0.0.1-SNAPSHOT.jar.original b/Second-Assigment/stockmanager-0.0.1-SNAPSHOT.jar.original new file mode 100644 index 0000000..c3d7512 Binary files /dev/null and b/Second-Assigment/stockmanager-0.0.1-SNAPSHOT.jar.original differ diff --git a/Second-Assigment/stockmanager-service.yaml b/Second-Assigment/stockmanager-service.yaml new file mode 100644 index 0000000..031a0d4 --- /dev/null +++ b/Second-Assigment/stockmanager-service.yaml @@ -0,0 +1,42 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: stockmanager + labels: + app: stockmanager +spec: + type: NodePort + selector: + app: stockmanager + ports: + - protocol: TCP + port: 8030 + name: http + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stockmanager +spec: + selector: + matchLabels: + app: stockmanager + replicas: 1 + template: + metadata: + labels: + app: stockmanager + spec: + containers: + - name: stockmanager + image: thetips4you/stockmanager:latest + ports: + - containerPort: 8030 + livenessProbe: + httpGet: + path: /health + port: 8030 + initialDelaySeconds: 30 + timeoutSeconds: 1 diff --git a/Second-Assigment/update.sample b/Second-Assigment/update.sample new file mode 100644 index 0000000..c4d426b --- /dev/null +++ b/Second-Assigment/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0