git_ex1/amip

.github/workflows/pre-submit-test.yaml

@@ -20,7 +20,7 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/heads/linux_ex2/')  }}
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-  PythonKata1Test:
+  PythonKataTest:
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.ref, 'refs/heads/python_katas_')  }}
     steps:
@@ -29,6 +29,6 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
-      - name: Katas Tests results
+      - name: Kata 1 Tests results
         run: |
-          python -m python_katas.kata_1.test
+          python -m python_katas.kata_1.test

.gitignore

@@ -9,6 +9,10 @@ __pycache__/
 *.so
 
 
+# ignore .pem file
+*.pem
+**/*.weights
+
 # Distribution / packaging
 .Python
 env/

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+# Further reading in https://pre-commit.com/index.html
+repos:
+  -   repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v2.3.0
+      hooks:
+        -   id: detect-aws-credentials
+        -   id: detect-private-key

01_encryption/symmetric/decrypted_secret

@@ -0,0 +1 @@
+plaintext secret

02_linux_ex1/src/CONTENT_TO_HASH

@@ -0,0 +1,5 @@
+With the sun in my hand
+Gonna throw the sun
+Way across the land-
+Cause I’m tired,
+Tired as I can be

02_linux_ex1/src/generateSecret.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# practice dir creation
+if [ ! -d "secretDir" ]; then
+  echo "Failed to generate secret. The directory 'secretDir' must exist before."
+  exit 1
+fi
+
+# practice dir deletion and file move
+if [ -d "maliciousFiles" ]; then
+  echo "Failed to generate secret. The directory 'maliciousFiles' contains some malicious files... it must be removed before."
+  exit 1
+fi
+
+# practice file creation
+if [ ! -f "secretDir/.secret" ]; then
+  echo "Failed to generate secret. The directory 'secretDir' must contain a file '.secret' in which the secret will be stored."
+  exit 1
+fi
+
+# practice change permissions
+OCTAL_PERMISSIONS=$(stat -c "%a" secretDir/.secret)
+if [ "$OCTAL_PERMISSIONS" != "600" ]; then
+  echo "Failed to generate secret. The file 'secretDir/.secret' must have read and write permission only."
+  exit 1
+fi
+
+# practice file linking understanding
+if [ -L 'important.link' ] && [ ! -e 'important.link' ]; then
+  echo "Failed to generate secret. Secret can not be generated when broken file link exists. Please do something..."
+  exit 1
+fi
+
+cat ./CONTENT_TO_HASH | xargs | md5sum > secretDir/.secret && echo "Done! Your secret was stored in secretDir/.secret"

02_linux_ex1/src/yourSolution.sh

@@ -0,0 +1,2 @@
+
+

02_linux_ex1/whatIdo.c

@@ -0,0 +1,31 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+struct stat st = {0};
+
+
+
+int main() {
+    if (stat("./welcomeToDevOpsJan22", &st) == -1) {
+      mkdir("./welcomeToDevOpsJan22", 0700);
+    }
+
+    int num;
+    FILE *fptr;
+
+    // use appropriate location if you are using MacOS or Linux
+    fptr = fopen("welcomeToDevOpsJan22/goodLuck","w");
+
+    if(fptr == NULL)
+    {
+    printf("Error!");
+    exit(1);
+    }
+
+    fprintf(fptr,"%s","There you go... tell me what I do...");
+    fclose(fptr);
+  return 0;
+}

05_simple_webserver/app.py

@@ -1,11 +1,15 @@
+import os
 from flask import Flask, send_file, request
 
 app = Flask(__name__)
 
+hostname = os.environ.get('HOSTNAME', None)
+
 
 # Try by:  curl localhost:8080
 @app.route('/', methods=['GET'])
 def index():
+    print(request.headers)
     return 'Hello world\n'
 
 
@@ -23,5 +27,20 @@ def profile_picture():
     return send_file('images/profile-1.jpg', mimetype='image/gif')
 
 
+@app.route('/status')
+def status():
+    return 'OK'
+
+
+@app.route('/load-test')
+def load_test_endpoint():
+    x = 6
+    for i in range(1, 10):
+        x *= i
+        x /= i
+
+    return f'Done {hostname}'
+
+
 if __name__ == '__main__':
     app.run(debug=True, port=8080, host='0.0.0.0')

05_simple_webserver/simple_webserver.wsgi

@@ -0,0 +1,4 @@
+import sys
+sys.path.insert(0, '/var/www/simple_webserver')
+
+from app import app as application

07_git_exercises/dima_ex1/README

@@ -0,0 +1,143 @@
+#my git_ex1 exercise answers :
+
+#Git Basics :
+
+1. echo "1" > abc.txt
+2. "red color" because the file not in index
+
+3. "green color" after adding file to index (git add abc.txt && git commit -m "adding abc.txt file")
+
+4. echo "2" >> abc.txt
+5. "blue color"
+
+6. git diff or git diff main
+
+7. because i dont have staged files for the next commit
+
+8. its a invalid argument because i dont have stage2 HEAD(or any hash or branch) in my repository
+
+9. git add abc.txt
+10. prints nothing because all my files is staged in index ( git diff only shows unstaged changes (--staged/--cached option showing staged changes))
+
+11. git diff ---cached or --staged in more recent versions of git
+
+12. echo "3" >> abc.txt
+13. No, the output is different because git diff main shows unstaged changes also and git diff --staged shows only the staged changes !
+
+14. Because the same reason as above,  the green color for "changes to be committed" and red color for "changes not stage for commit"
+
+15. git reset -- abc.txt for remove the staged files in index and git restore -- abc.txt for unstaged files in working tree
+
+#Resolve conflicts:
+
+1. git branch:
+  output:
+  bugfix/fix_readme_typo
+  bugfix/open_kibana_port
+  dev
+  feature/data_retention_policy
+  feature/elasticsearch_helm_chart
+  feature/upgrade_angular_version
+  feature/version1
+  feature/version2
+* main
+  reset_question
+
+2. git checkout -b feature/lambda_migration (the git checkout command accepts a -b argument that acts as a convenience method which will create new branch and switch to it immediately)
+   output:
+   Switched to a new branch 'feature/lambda_migration'
+
+3. git merge feature/version1
+   output:
+   Merge made by the 'recursive' strategy.
+    .env        | 0
+    app.py      | 4 ++--
+    config.json | 0
+    3 files changed, 2 insertions(+), 2 deletions(-)
+    create mode 100644 .env
+    create mode 100644 config.json
+
+4. git log:
+   output:
+   commit 84c58db9790c249a2b12cda2a0f2a1726e272e8d (HEAD -> feature/lambda_migration)
+   Merge: d89dca1 8019018
+   Author: dmitriyshub <d.shtranvasser@gmail.com>
+   Date:   Tue May 24 12:37:21 2022 +0300
+
+    Merge branch 'feature/version2' into feature/lambda_migration
+
+    # Conflicts:
+    #       app.py
+
+    commit d89dca1c732a45479f956147da71cd096bb5fc73
+
+    # Conflicts:
+    #       app.py
+
+   commit d89dca1c732a45479f956147da71cd096bb5fc73
+   Merge: d14ba66 e0f83f5
+   Author: dmitriyshub <d.shtranvasser@gmail.com>
+   Date:   Tue May 24 12:26:26 2022 +0300
+
+    Merge branch 'feature/version1' into feature/lambda_migration
+
+   Answer: Yes we have one commit for each merge
+
+#Cherry Picking:
+
+1. git checkout main && git checkout -b feature/lambda_migration2
+
+4. config.json and .env files
+
+5. yes because the commits must be related with each other by order
+
+#Changes in working tree and switch branches:
+
+1. git branch
+2. nano take.txt, save file after changes. git add take.txt
+3. git checkout dev
+   output:
+   error: Your local changes to the following files would be overwritten by checkout:
+        take.txt
+   Please commit your changes or stash them before you switch branches.
+   Aborting
+   answer: suggested approaches from git - commit or stash
+           git stash saves the local modification away and reverts the working directory to match the HEAD commit
+4. No , the text overwritten to a b c on separate lines
+5. No, my local uncommited changes will be overwritten and i will lose them
+
+# Reset:
+
+1. git checkout reset_question
+2.
+   1: git reset --soft HEAD~1
+   output1:
+   On branch reset_question
+   Changes to be committed:
+   (use "git restore --staged <file>..." to unstage)
+         new file:   10.txt
+   answer1:
+   the command will remove the last commit from the current branch,but the file changes will stay in working tree
+
+   2: git reset --mixed HEAD~1
+   output2:
+   On branch reset_question
+   Untracked files:
+   (use "git add <file>..." to include in what will be committed)
+         10.txt
+         9.txt
+
+   nothing added to commit but untracked files present (use "git add" to track)
+
+   answer2:
+   the coomand will still kepp the changes in your working tree but not in the index
+
+   3: git reset --hard HEAD~1
+   output3:
+   HEAD is now at 17a0b5d 7
+   ansswer3:
+   lose all uncommited changes and all untracked files in addition to the changes introduced in the last commit
+
+   4. revert the last git commit, it will record a new commit with the changes introduced by reverting the last commit
+
+#end

07_git_exercises/shlomigd_ex1/README

@@ -0,0 +1,68 @@
+Git Basics:
+
+1. cat > abc.txt
+   1
+   ctrl d
+
+2.Red.
+3.Green.
+    git status
+    git add abc.txt
+    git status
+    git commit abc.txt -m "file created"
+4.  echo "2" >> abc.txt
+5.Blue.
+6.git diff main.
+7.Because we didn't add the file abc.txt to the index area.
+8.Because stage2 is not an option of the command git diff.
+9.  git add abc.txt
+10.git diff prints nothing because there is no differences between the index and the working copy.
+11. git diff --staged.
+12. echo "3" >> abc.txt
+13.No,because the git diff --staged command will compare the index with the master and the command git diff main will also compare the changes in the working copy.
+14.Because one change in the file is ready to be committed and another change is not staged for commit.
+15. git reset --hard
+
+Resolve conflicts:
+
+1. git branch
+6. Yes, the commits are:
+[git_ex1_repo] git -c credential.helper= -c core.quotepath=false -c log.showSignature=false commit -F C:\Users\shlomi\PycharmProjects\git_ex1_repo\.git\MERGE_MSG --
+[feature/lambda_migration 798ff58] Merge branch 'feature/version2' into feature/lambda_migration
+
+Cherry picking:
+
+4. file config.json and file .env.
+5.Yes,because if the first commit create a file and the second one update the file and you will choose to cherry pick only the second one it will fail
+  and sometimes you create a function that calls another function and if and if this function is missing it will fail.
+
+Changes in working tree and switch branches:
+
+1. git branch
+2. cat > take.txt
+   shlomi shlomi
+   gedasi gedasi
+   ctrl d
+   git add take.txt
+3. git checkout dev
+   error: Your local changes to the following files would be overwritten by checkout:
+        take.txt
+    Please commit your changes or stash them before you switch branches.
+    Aborting
+
+One approach suggested by git is to commit the changes before switching to another branch and the second one is to stash the changes.
+
+5. No.
+6. No, the file take.txt doesn't exist.
+   The Force Checkout removes all uncommitted changes.
+
+Reset:
+
+1. git checkout reset_question
+2.1 The command removed the last commit, now file 10.txt ready to be committed.
+2.2 The command removed the last commit,removes files from the index and keep the changes in the working copy,
+    The file 10.txt removed from the index and now the file is in the working copy with other files.
+2.3 The command removed the last commit and all the untracked and uncommitted changes.
+2.4 The command removes the last commit by adding a new commit to cancel the changes.
+3. The notation HEAD~1 in the git reset command means to reset the last commit.
+

08_python_class/bank_account.py

@@ -18,6 +18,10 @@ class Account:
 
     currency = '$'
 
+    @staticmethod
+    def usd_to_ils_convert():
+        return 3.77
+
     def __init__(self, name, balance):
         self.owner = name
         self.balance = balance