Merge branch 'main' of https://github.com/PattiyaY/Orchestronic

Author: PattiyaY

dags/__pycache__/create_resource_group.cpython-312.pyc

@@ -286,6 +286,16 @@ def generate_main_tf(project_id):
     address_prefixes     = ["10.0.1.0/24"]
 }}
 
+# Public IP Addresses
+resource "azurerm_public_ip" "vm_public_ip" {{
+    for_each = {{ for vm in var.vm_resources : vm.name => vm }}
+    
+    name                = "${{each.value.name}}-public-ip"
+    location            = azurerm_resource_group.project_rg.location
+    resource_group_name = azurerm_resource_group.project_rg.name
+    allocation_method   = "Dynamic"
+}}
+
 # Network Interfaces
 resource "azurerm_network_interface" "vm_nic" {{
     for_each = {{ for vm in var.vm_resources : vm.name => vm }}
@@ -298,9 +308,12 @@ def generate_main_tf(project_id):
         name                          = "internal"
         subnet_id                     = azurerm_subnet.project_subnet.id
         private_ip_address_allocation = "Dynamic"
+        public_ip_address_id          = azurerm_public_ip.vm_public_ip[each.key].id
     }}
 }}
 
+
+
 # Virtual Machines
 resource "azurerm_virtual_machine" "vm" {{
     for_each = {{ for vm in var.vm_resources : vm.name => vm }}
@@ -494,7 +507,7 @@ def generate_variables_tf(project_id):
         "ARM_CLIENT_SECRET": os.getenv("AZURE_CLIENT_SECRET"),
         "ARM_TENANT_ID": os.getenv("AZURE_TENANT_ID"),
     },
-    retries=3,
+    retries=3, 
     retry_delay=timedelta(minutes=5),
 )
 

dags/__pycache__/delete_resource_group.cpython-312.pyc

@@ -14,6 +14,7 @@ const resourceSchema = new Schema({
   username: { type: String },
   password: { type: String },
   allocationip: { type: String },
+  // publicipenabled: { type: Boolean },
   projectid: { type: String },
 });
 

dags/__pycache__/orchestronic_pipeline.cpython-312.pyc

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@azure/arm-compute": "^22.3.0",
+    "@azure/arm-network": "^33.5.0",
     "@azure/arm-resources": "^5.2.0",
     "@azure/identity": "^4.7.0",
     "@clerk/nextjs": "^6.12.0",

dags/create_resources.py

@@ -17,6 +17,7 @@ export default function CloudResources({ params }) {
   const [adminPassword, setAdminPassword] = useState("");
   const [vmSize, setVMSize] = useState("");
   const [allocation, setAllocation] = useState("");
+  // const [publicIpEnabled, setPublicIpEnabled] = useState(true);
   const [alert, setAlert] = useState("");
   const [availableVM, setAvailableVM] = useState([]);
   const [warning, setWarning] = useState("");
@@ -378,6 +379,7 @@ export default function CloudResources({ params }) {
           adminPassword,
           vmSize,
           allocation,
+          // publicIpEnabled,
           projectID,
         }),
       });
@@ -688,7 +690,7 @@ export default function CloudResources({ params }) {
           </div>
 
           {/* Admin Password */}
-          <div className="mt-4">
+          <div>
             <label htmlFor="adminPassword" className="font-medium block mb-2">
               Admin Password
             </label>
@@ -737,6 +739,23 @@ export default function CloudResources({ params }) {
               <option value="Static">Static</option>
             </select>
           </div>
+
+          {/* Public IP Configuration */}
+          {/* <div>
+            <label htmlFor="publicIpEnabled" className="font-medium block mb-2">
+              Public IP Address
+            </label>
+            <select
+              id="publicIpEnabled"
+              name="publicIpEnabled"
+              className="border border-slate-300 rounded w-full px-4 py-2 text-base"
+              onChange={(e) => setPublicIpEnabled(e.target.value === "true")}
+            >
+              <option value="">Select public IP option</option>
+              <option value="true">Enable Public IP</option>
+              <option value="false">Disable Public IP</option>
+            </select>
+          </div> */}
         </div>
 
         {/* Optional Details

dags/idp.py

@@ -0,0 +1,25 @@
+export default function ConnectionModal({ isOpen, onClose, children }) {
+    if (!isOpen) return null;
+  
+    return (
+      <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+        <div className="bg-white rounded-lg max-w-2xl w-full max-h-[90vh] overflow-y-auto">
+          <div className="p-6">
+            <div className="flex justify-between items-center mb-4">
+              <h2 className="text-2xl font-bold">Connection Instructions</h2>
+              <button 
+                onClick={onClose}
+                className="text-gray-500 hover:text-gray-700"
+              >
+                <svg xmlns="http://www.w3.org/2000/svg" className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
+                </svg>
+              </button>
+            </div>
+            
+            <div>{children}</div>
+          </div>
+        </div>
+      </div>
+    );
+  }

models/resource.js

@@ -159,7 +159,11 @@ export default function CreateProject() {
       }
 
       setProjectData(projectDetails);
-      router.push(`/requestresource`);
+      router.push("/requestresource");
+      // router.push({
+      //   pathname: "/requestresource",
+      //   query: { projectId: project._id }
+      // });
     } catch (error) {
       console.error("Error saving project:", error);
       alert("Failed to save project. Please try again.");