Merge pull request #123 from mayurmadnani/main

ND064 Course 1 upgrades and fixes
https://udacity.atlassian.net/browse/CONUPDATE-4103

Author: SudKul

exercises/Vagrantfile

@@ -5,12 +5,12 @@ ENV["TERM"]="linux"
 Vagrant.require_version ">= 2.2.10"
 Vagrant.configure("2") do |config|
   config.vm.provision "shell",
-    inline: "sudo su - && zypper update && zypper install -y apparmor-parser"
+    inline: "sudo zypper update -y && sudo zypper install -y apparmor-parser"
 
   # Set the image for the vagrant box
-  config.vm.box = "opensuse/Leap-15.2.x86_64"
-  # Set the image version
-  config.vm.box_version = "15.2.31.632"
+  config.vm.box = "opensuse/Leap-15.6.x86_64"
+  config.vm.box_version = "15.6.13.356"
+  config.vm.boot_timeout = 900
 
   # Forward the ports from the guest VM to the local host machine
   config.vm.network "forwarded_port", guest: 8080, host: 8080

exercises/github-actions-python-version/python-version.yml

@@ -0,0 +1,25 @@
+## file location and name: # .github/workflows/python-version.yml
+
+##  Named of the workflow.
+name: Python version
+## Set the trigger policy.
+## In this case, the workflow is execute on a `push` event,
+## or when a new commit is pushed to the repository
+on: [push]
+## List the steps to be executed by the workflow
+jobs:
+  ## Set the name of the job
+  check-python-version:
+    ## Configure the operating system the workflow should run on.
+    ## In this case, the job on Ubuntu
+    runs-on: ubuntu-latest
+    ## Define a sequence of steps to be executed 
+    steps:
+      ## Use the public `checkout` action in version v2  
+      ## to checkout the existing code in the repository
+      - uses: actions/checkout@v2
+      ## Use the public `setup-python` action  in version v2  
+      ## to install python on the  Ubuntu based environment 
+      - uses: actions/setup-python@v2
+      ## Executes the `python --version` command
+      - run: python --version

exercises/python-helloworld/requirements.txt

@@ -1,2 +1 @@
-Flask==2.1.0
-werkzeug==2.0.0
+Flask==3.1.0

solutions/go-helloworld/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine
+FROM golang:1.22.2-alpine
 
 WORKDIR /go/src/app
 

solutions/go-helloworld/main.go

@@ -1,15 +1,63 @@
 package main
 
 import (
+    "encoding/json"
     "fmt"
+    "log"
     "net/http"
 )
 
-func helloWorld(w http.ResponseWriter, r *http.Request){
-    fmt.Fprintf(w, "Go - Hello World")
+// HealthCheckResponse represents the /status JSON structure
+type HealthCheckResponse struct {
+    Result string `json:"result"`
+}
+
+// MetricsData holds metric details
+type MetricsData struct {
+    UserCount      int `json:"UserCount"`
+    UserCountActive int `json:"UserCountActive"`
+}
+
+// MetricsResponse represents the /metrics JSON structure
+type MetricsResponse struct {
+    Status string      `json:"status"`
+    Code   int         `json:"code"`
+    Data   MetricsData `json:"data"`
+}
+
+func helloHandler(w http.ResponseWriter, r *http.Request) {
+    log.Println("Main request successful")
+    fmt.Fprintln(w, "Go - Hello World")
+}
+
+func statusHandler(w http.ResponseWriter, r *http.Request) {
+    log.Println("Status request successful")
+    response := HealthCheckResponse{Result: "OK - healthy"}
+    w.Header().Set("Content-Type", "application/json")
+    json.NewEncoder(w).Encode(response)
+}
+
+func metricsHandler(w http.ResponseWriter, r *http.Request) {
+    log.Println("Metrics request successful")
+    response := MetricsResponse{
+        Status: "success",
+        Code:   0,
+        Data: MetricsData{
+            UserCount:      140,
+            UserCountActive: 23,
+        },
+    }
+    w.Header().Set("Content-Type", "application/json")
+    json.NewEncoder(w).Encode(response)
 }
 
 func main() {
-    http.HandleFunc("/", helloWorld)
-    http.ListenAndServe(":6111", nil)
+    http.HandleFunc("/", helloHandler)
+    http.HandleFunc("/status", statusHandler)
+    http.HandleFunc("/metrics", metricsHandler)
+
+    log.Println("Starting server on port 6111...")
+    if err := http.ListenAndServe(":6111", nil); err != nil {
+        log.Fatalf("Could not start server: %s\n", err)
+    }
 }

solutions/python-helloworld/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.12
 LABEL maintainer="Katie Gamanji"
 
 COPY . /app

solutions/python-helloworld/app.py

@@ -4,8 +4,23 @@
 
 app = Flask(__name__)
 
+# Set up logging to a file
+formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s')
+
+file_handler = logging.FileHandler('app.log')
+file_handler.setLevel(logging.DEBUG)
+file_handler.setFormatter(formatter)
+
+app.logger.setLevel(logging.DEBUG)
+app.logger.addHandler(file_handler)
+
+# Also capture Werkzeug logs (for request info)
+werkzeug_logger = logging.getLogger('werkzeug')
+werkzeug_logger.setLevel(logging.INFO)
+werkzeug_logger.addHandler(file_handler)
+
 @app.route('/status')
-def healthcheck():
+def status():
     response = app.response_class(
             response=json.dumps({"result":"OK - healthy"}),
             status=200,
@@ -32,7 +47,4 @@ def hello():
     return "Hello World!"
 
 if __name__ == "__main__":
-    ## stream logs to a file
-    logging.basicConfig(filename='app.log',level=logging.DEBUG)
-    
     app.run(host='0.0.0.0')

solutions/python-helloworld/requirements.txt

@@ -1,2 +1 @@
-Flask==2.1.0
-werkzeug==2.0.0
+Flask==3.1.0